From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C402158086 for ; Sun, 26 Dec 2021 17:52:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D9A62BC05B; Sun, 26 Dec 2021 17:52:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ABDA72BC060 for ; Sun, 26 Dec 2021 17:52:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11334342FBF for ; Sun, 26 Dec 2021 17:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8BF8272 for ; Sun, 26 Dec 2021 17:52:35 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1640541112.68ad2e4b190faec5ea7abea491b41cc3a4f0a261.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/xxv/files/, profiles/, www-misc/xxv/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/package.mask www-misc/xxv/Manifest www-misc/xxv/files/xxv.utf8-v5 www-misc/xxv/files/xxvd-1.0.cfg www-misc/xxv/files/xxvd-logrotate www-misc/xxv/metadata.xml www-misc/xxv/xxv-1.6.1-r3.ebuild X-VCS-Directories: www-misc/xxv/ profiles/ www-misc/xxv/files/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 68ad2e4b190faec5ea7abea491b41cc3a4f0a261 X-VCS-Branch: master Date: Sun, 26 Dec 2021 17:52:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed205665-f8c8-48be-bc23-f614d1277fb3 X-Archives-Hash: 5ccce5de468f686b30ebbd9b68b131f7 commit: 68ad2e4b190faec5ea7abea491b41cc3a4f0a261 Author: Jakov Smolić gentoo org> AuthorDate: Sun Dec 26 17:51:52 2021 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Sun Dec 26 17:51:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ad2e4b www-misc/xxv: treeclean Closes: https://bugs.gentoo.org/827669 Signed-off-by: Jakov Smolić gentoo.org> profiles/package.mask | 6 -- www-misc/xxv/Manifest | 1 - www-misc/xxv/files/xxv.utf8-v5 | 100 -------------------- www-misc/xxv/files/xxvd-1.0.cfg | 162 -------------------------------- www-misc/xxv/files/xxvd-logrotate | 26 ------ www-misc/xxv/metadata.xml | 9 -- www-misc/xxv/xxv-1.6.1-r3.ebuild | 190 -------------------------------------- 7 files changed, 494 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 325ef9e442af..56a67cacc95f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -244,12 +244,6 @@ dev-java/ws-commons-util dev-java/xml-security dev-java/xmpcore -# Marek Szuba (2021-11-27) -# XXV has been outdated and unmaintained in Gentoo for years. -# EAPI 5, numerous QA violations. -# Removal in 30 days. Bug #827669 -www-misc/xxv - # Hans de Graaff (2021-11-26) # Mask new rubygems version for testing. This version uses a new # gentoo-defaults profile, bug #789957 diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest deleted file mode 100644 index be4c64992039..000000000000 --- a/www-misc/xxv/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xxv-1.6.1.tgz 992065 BLAKE2B 9c0b9d2575f412a677a84b1fe0417042f74c4ee4225181a14447e996a8fad46d0fdb4f5ada57fc02ff875be3a7602cf2e8976416b0fd5596b3adb1061ddc8f4a SHA512 e5171ea02d00d7c07d0faf5361a5261bf882d3c5a996b864593216a941c35f823b09431579341f43cf75f87dd42a1635275e8a24b393d407c83c7eb299095566 diff --git a/www-misc/xxv/files/xxv.utf8-v5 b/www-misc/xxv/files/xxv.utf8-v5 deleted file mode 100644 index 1a6880c7aacd..000000000000 --- a/www-misc/xxv/files/xxv.utf8-v5 +++ /dev/null @@ -1,100 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -RUNAS_USER="vdr" - -# Set Verbose Level 0 -> 5 -VERBOSE="1" - -#export LANG=de_DE.utf8 - -depend() { - need vdr -} - -# some fixed Path -CONFIGFILE="/etc/xxv/xxvd.cfg" -PIDFILE="/var/run/xxv/xxvd.pid" -XXV_BIN="/usr/bin/xxvd" -LOGFILE="/var/log/xxv/xxvd.log" - -xxv_logger() { - printf "\tXXV running as user: ${RUNAS_USER}\n" >> "${LOGFILE}" - printf "\tVerbose Level: ${VERBOSE}\n" >> "${LOGFILE}" - printf "\tYou can change this in xxv init script\n\n" >> "${LOGFILE}" -} - -check_vdradmin() { - - # Check at first, is VDR-Admin running - # Stopping, while running on same ports - if [ -n "`netstat -anp | grep vdradmin | grep 8080`" ] ; then - echo - eerror "VDR-Admin will Stop at first now" - eerror "vdradmin and xxv can not run on the same port" - echo - /etc/init.d/vdradmin stop - fi -} - -xxv_kill_pid() { - - # After unclear stop, xxvd.pid will not removed, fixed with next line - if [ ! -x /etc/init.d/root ]; then - if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then - rm ${PIDFILE} - killall xxvd 2> /dev/null - fi - fi - -} - -xxv_kill_initfile() { - - # After unclear stop, init file in /var/lib/init.d/started/ still not removed - - if [ ! -x /etc/init.d/root ]; then - if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then - rm /var/lib/init.d/started/xxv - /etc/init.d/xxv zap - killall xxvd 2> /dev/null - fi - fi - -} - -start() { - check_vdradmin - xxv_logger - - ebegin "Start xxv" - echo - einfo "xxv running as user: ${RUNAS_USER}" - einfo "Verbose Level: ${VERBOSE}" - - start-stop-daemon --nicelevel 15 --pidfile ${PIDFILE} --start -u ${RUNAS_USER} --exec ${XXV_BIN} -- \ - -configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE} - eend $? -} - - -stop() { - - ebegin "Stopping xxvd" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} - - xxv_kill_pid - xxv_kill_initfile - - eend $? -} - -#restart() { - -# xxv_kill_pid -# xxv_kill_initfile - -# svc_stop -# svc_start -#} diff --git a/www-misc/xxv/files/xxvd-1.0.cfg b/www-misc/xxv/files/xxvd-1.0.cfg deleted file mode 100644 index b18f899ba581..000000000000 --- a/www-misc/xxv/files/xxvd-1.0.cfg +++ /dev/null @@ -1,162 +0,0 @@ -[AUTOTIMER] -active=y -exclude=POS > 250 -interval=300 - -[CHANNELS] -empty=n -file=/etc/vdr/channels.conf -filterCA=0,1,2,3,4 -interval=300 -stripCH=short,long;provider - -[EPG] -epgfile=/var/vdr/epg.data -epgimages=/var/vdr/video/epgimages -interval=300 -periods=12:00,18:00,20:20,22:00,23:00,00:00,02:00,04:00 -restart=3 -timeframe=2 - -[GRAB] -file=/tmp/live.jpg -font=VeraBI.ttf -imgfontsize=12 -imgquality=90 -imgtext=[?- i = channel.split(" ") -?][[? i.shift ?]] [? i.join(" ") ?]: [? event.Title ?] -vpos=20 -xsize=480 -ysize=360 - -[General] -DSN=DBI:mysql:database=xxv;host=localhost;port=3306 -Language=de_DE -PWD=xpix97 -USR=xpix -initscript=/etc/init.d/xxv - -[HTTPD] -Clients=1000 -HtmlRoot=html -Port=8080 -StartPage=schema -active=y - -[INTERFACE] -Clients=5 -Port=8002 -active=y - -[LOGREAD] -active=y -rows=100 -syslog=/var/log/syslog -tail=/usr/bin/tail - -[MUSIC] -active=y -clients=5 -coverimages=/var/cache/xxv/cover -host=192.168.0.23 -path=/var/lib/video.00/MUSIC -port=8100 -proxy= - -[NEWS::JABBER] -active=n -level=1 -passwd=password -receiveUser=receiveUser@jabber.org -user=newsxxv@jabber.org - -[NEWS::MAIL] -active=n -address=xxv@example.com -interval=6 -level=1 -smtp=smtp.googlemail.com -spwd=password -susr=user - -[NEWS::RSS] -active=y -level=1 - -[NEWS::VDR] -active=y -level=1 - -[RECORDS] -commandfile=/etc/vdr/reccmds.conf -interval=600 -previewbinary=/usr/bin/vdr2jpeg -previewcommand=vdr2jpeg -previewcount=3 -previewimages=/var/cache/xxv/preview -previewlistthumbs=n -previewlog=/var/log/xxv/xxvd_mplayer.log -vfat=n -videodir=/var/vdr/video - -[REMOTE] -active=y -commands=/etc/vdr/commands.conf - -[REPORT] -active=y -host=www.dyndns.org -interval=6 - -[ROBOT] -active=y -interval=3600 - -[STATUS] -active=y -dfBinary=/bin/df -font=VeraBI.ttf -history=1 -interval=15 -wcBinary=/usr/bin/wc -whoBinary=/usr/bin/who - -[STREAM] -host=192.168.0.23 -netvideo=\\192.168.0.23\video - -[SVDRP] -VdrHost=localhost -VdrPort=2001 - -[TELNET] -Clients=5 -Port=8001 -active=y - -[TIMERS] -DVBCards=1 -Lifetime=50 -Priority=50 -afterminutes=5 -deactive=y -file=/etc/vdr/timers.conf -interval=300 -prevminutes=1 - -[USER] -active=y -noAuth=192.168.0.0/24, 127.0.0.1/32 -tempimages=/var/cache/xxv/temp -withAuth=192.168.1.0/24 - -[VTX] -active=y -cache=packed -dir=/var/cache/vdr/vtx -vtximages=./share/vtx - -[WAPD] -Clients=5 -Port=8085 -WMLRoot=/usr/share/xxv-0.91_pre1126/wml -active=y diff --git a/www-misc/xxv/files/xxvd-logrotate b/www-misc/xxv/files/xxvd-logrotate deleted file mode 100644 index 23854f73b086..000000000000 --- a/www-misc/xxv/files/xxvd-logrotate +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -/var/log/xxv/xxvd.log { - compress - daily - dateext - maxage 365 - rotate 99 - size +4096k - notifempty - missingok - copytruncate -} - -/var/log/xxv/xxvd_mplayer.log { - compress - daily - dateext - maxage 365 - rotate 99 - size +4096k - notifempty - missingok - copytruncate -} diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml deleted file mode 100644 index 146baa728576..000000000000 --- a/www-misc/xxv/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - Enable more themes via - x11-themes/xxv-skins - - diff --git a/www-misc/xxv/xxv-1.6.1-r3.ebuild b/www-misc/xxv/xxv-1.6.1-r3.ebuild deleted file mode 100644 index 13b7f874d3a9..000000000000 --- a/www-misc/xxv/xxv-1.6.1-r3.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils - -VERSION="718" # every bump, new version - -DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)" -HOMEPAGE="https://projects.vdr-developer.org/projects/xxv" -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz - mirror://gentoo/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mplayer themes" - -RDEPEND=">=media-video/vdr-1.2.6 - media-video/vdr2jpeg - media-fonts/corefonts - virtual/mysql - dev-perl/CGI - virtual/perl-Digest-MD5 - virtual/perl-Getopt-Long - virtual/perl-MIME-Base64 - virtual/perl-Time-HiRes - virtual/perl-IO-Compress - dev-perl/Config-Tiny - dev-perl/Date-Manip - dev-perl/DBD-mysql - dev-perl/DBI - dev-perl/Digest-HMAC - dev-perl/Encode-Detect - dev-perl/Event - dev-perl/Font-TTF - dev-perl/GD[png(+),gif(+)] - dev-perl/IO-Socket-INET6 - dev-perl/JSON - dev-perl/JSON-XS - dev-perl/Linux-Inotify2 - dev-perl/Locale-gettext - dev-perl/MP3-Info - dev-perl/Net-Amazon - dev-perl/Net-Telnet - dev-perl/Net-XMPP - dev-perl/Proc-ProcessTable - dev-perl/SOAP-Lite - dev-perl/txt2html - dev-perl/Template-GD - dev-perl/Template-Toolkit - dev-perl/XML-RSS - themes? ( >=x11-themes/${PN}-skins-1.6 )" - -PDEPEND="mplayer? ( media-video/mplayer )" - -SHAREDIR="/usr/share/${PN}" -LIBDIR="/usr/lib/${PN}" - -DB_VERS="32" - -db_update_check() { - - DB_VERS_OLD="`cat /var/db/pkg/www-misc/xxv-*/xxv-*.ebuild | grep DB_VERS | head -n 1 | cut -c10-11`" - - if [ "${DB_VERS_OLD}" -lt "${DB_VERS}" ]; then - echo - elog "An update of the XXV Database is necessary !!!" - echo - elog "\tcd ${SHAREDIR}/contrib" - echo - elog "\tIt is really important to edit the create-database.sql file first" - elog "\tdue to UTF-8 Support changes in the MySQL DB !!!" - echo - elog "\tafter this run ./update-xxv -h for more info" - echo - else - echo - elog "If this is a new install" - elog "You have to create an empty DB for XXV" - echo - elog "do this by:" - elog "cd ${SHAREDIR}/contrib" - eerror "read the README" - elog "For UTF-8 support it is really important to" - elog "edit create-database.sql file first and run" - elog "emerge --config ${PN}" - elog "afterwards" - echo - elog "Set your own language in" - elog "${SHAREDIR}/locale" - echo - elog "The default user/password is:" - elog "User/Password: xxv:xxv" - elog "You should change it immediately!" - echo - eerror "edit /etc/xxv/xxvd.cfg !" - fi -} - -pkg_setup() { - - if ! has_version "www-misc/${PN}"; then - echo - einfo "After you install xxv the very first time you should consider to read" - einfo "http://www.vdr-wiki.de/wiki/index.php/Xxv (German only)" - echo - fi - - db_update_check -} - -src_prepare() { - - sed -i "${S}"/bin/xxvd \ - -e "s:debian:Gentoo:" \ - -e "s:/var/log/xxvd.log:/var/log/xxv/xxvd.log:" \ - -e "s:/var/run/xxvd.pid:/var/run/xxv/xxvd.pid:" \ - -e "s:\$RealBin/../lib:${LIBDIR}:" \ - -e "s:\$RealBin/../locale:${SHAREDIR}/locale:" \ - -e "s:\$RealBin/../lib/XXV/MODULES:${LIBDIR}/XXV/MODULES:" \ - -e "s:\$RealBin/../etc/xxvd.cfg:/etc/xxv/xxvd.cfg:" \ - -e "s:\$RealBin/../doc:/usr/share/doc/${P}:" \ - -e "s:HTMLDIR => \"\$RealBin/../:HTMLDIR => \"${SHAREDIR}/skins:" \ - -e "s:\$RealBin/../share/vtx:${SHAREDIR}/vtx:" \ - -e "s:\$Real Bin/../lib/XXV/OUTPUT:${LIBDIR}/XXV/OUTPUT:" \ - -e "s:\$RealBin/../share/news:${SHAREDIR}/news:" \ - -e "s:\$RealBin/../contrib:${SHAREDIR}/contrib:" \ - -e "s:\$RealBin/../share/fonts/ttf-bitstream-vera:/usr/share/fonts/corefonts:" \ - -e "s:\$RealBin/../share/xmltv:${SHAREDIR}/xmltv:" - - sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl -} - -src_install() { - - newinitd "${FILESDIR}"/xxv.utf8-v5 xxv - - dobin bin/xxvd - - insinto /etc/"${PN}" - newins "${FILESDIR}"/xxvd-1.0.cfg xxvd.cfg - chown vdr:vdr "${D}"/etc/"${PN}"/xxvd.cfg - - insinto /etc/logrotate.d - newins "${FILESDIR}"/xxvd-logrotate xxvd - - diropts -m755 -ovdr -gvdr - keepdir /var/cache/xxv - keepdir /var/run/xxv - keepdir /var/log/xxv - - insinto "${LIBDIR}" - doins -r "${S}"/lib/* - - insinto "${SHAREDIR}" - doins -r "${S}"/share/{news,xmltv} - - insinto "${SHAREDIR}"/locale - doins -r "${S}"/locale/* - fperms 0755 "${SHAREDIR}"/locale/xgettext.pl - - insinto "${SHAREDIR}"/contrib - doins -r "${S}"/contrib/* - fperms 0755 "${SHAREDIR}"/contrib/update-xxv - - insinto "${SHAREDIR}"/skins - doins -r "${S}"/{html,wml} - doins "${S}"/doc/docu.tmpl - - cd "${S}"/doc - insinto /usr/share/doc/"${P}" - doins docu.tmpl CHANGELOG README - fowners vdr:vdr /usr/share/doc/"${P}" - - doman xxvd.1 -} - -pkg_config() { - - cd "${ROOT}"/"${SHAREDIR}" - cat ./contrib/create-database.sql | mysql -u root -p -} - -pkg_postrm() { - - einfo "Cleanup for old "${P}" files" - rm -r /usr/share/doc/"${P}" -}