Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/xxv/files/, profiles/, www-misc/xxv/
Date: Sun, 26 Dec 2021 17:52:45
Message-Id: 1640541112.68ad2e4b190faec5ea7abea491b41cc3a4f0a261.jsmolic@gentoo
1 commit: 68ad2e4b190faec5ea7abea491b41cc3a4f0a261
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 26 17:51:52 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 26 17:51:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ad2e4b
7
8 www-misc/xxv: treeclean
9
10 Closes: https://bugs.gentoo.org/827669
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 profiles/package.mask | 6 --
14 www-misc/xxv/Manifest | 1 -
15 www-misc/xxv/files/xxv.utf8-v5 | 100 --------------------
16 www-misc/xxv/files/xxvd-1.0.cfg | 162 --------------------------------
17 www-misc/xxv/files/xxvd-logrotate | 26 ------
18 www-misc/xxv/metadata.xml | 9 --
19 www-misc/xxv/xxv-1.6.1-r3.ebuild | 190 --------------------------------------
20 7 files changed, 494 deletions(-)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index 325ef9e442af..56a67cacc95f 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -244,12 +244,6 @@ dev-java/ws-commons-util
27 dev-java/xml-security
28 dev-java/xmpcore
29
30 -# Marek Szuba <marecki@g.o> (2021-11-27)
31 -# XXV has been outdated and unmaintained in Gentoo for years.
32 -# EAPI 5, numerous QA violations.
33 -# Removal in 30 days. Bug #827669
34 -www-misc/xxv
35 -
36 # Hans de Graaff <graaff@g.o> (2021-11-26)
37 # Mask new rubygems version for testing. This version uses a new
38 # gentoo-defaults profile, bug #789957
39
40 diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
41 deleted file mode 100644
42 index be4c64992039..000000000000
43 --- a/www-misc/xxv/Manifest
44 +++ /dev/null
45 @@ -1 +0,0 @@
46 -DIST xxv-1.6.1.tgz 992065 BLAKE2B 9c0b9d2575f412a677a84b1fe0417042f74c4ee4225181a14447e996a8fad46d0fdb4f5ada57fc02ff875be3a7602cf2e8976416b0fd5596b3adb1061ddc8f4a SHA512 e5171ea02d00d7c07d0faf5361a5261bf882d3c5a996b864593216a941c35f823b09431579341f43cf75f87dd42a1635275e8a24b393d407c83c7eb299095566
47
48 diff --git a/www-misc/xxv/files/xxv.utf8-v5 b/www-misc/xxv/files/xxv.utf8-v5
49 deleted file mode 100644
50 index 1a6880c7aacd..000000000000
51 --- a/www-misc/xxv/files/xxv.utf8-v5
52 +++ /dev/null
53 @@ -1,100 +0,0 @@
54 -#!/sbin/openrc-run
55 -# Copyright 1999-2012 Gentoo Foundation
56 -# Distributed under the terms of the GNU General Public License, v2 or later
57 -
58 -RUNAS_USER="vdr"
59 -
60 -# Set Verbose Level 0 -> 5
61 -VERBOSE="1"
62 -
63 -#export LANG=de_DE.utf8
64 -
65 -depend() {
66 - need vdr
67 -}
68 -
69 -# some fixed Path
70 -CONFIGFILE="/etc/xxv/xxvd.cfg"
71 -PIDFILE="/var/run/xxv/xxvd.pid"
72 -XXV_BIN="/usr/bin/xxvd"
73 -LOGFILE="/var/log/xxv/xxvd.log"
74 -
75 -xxv_logger() {
76 - printf "\tXXV running as user: ${RUNAS_USER}\n" >> "${LOGFILE}"
77 - printf "\tVerbose Level: ${VERBOSE}\n" >> "${LOGFILE}"
78 - printf "\tYou can change this in xxv init script\n\n" >> "${LOGFILE}"
79 -}
80 -
81 -check_vdradmin() {
82 -
83 - # Check at first, is VDR-Admin running
84 - # Stopping, while running on same ports
85 - if [ -n "`netstat -anp | grep vdradmin | grep 8080`" ] ; then
86 - echo
87 - eerror "VDR-Admin will Stop at first now"
88 - eerror "vdradmin and xxv can not run on the same port"
89 - echo
90 - /etc/init.d/vdradmin stop
91 - fi
92 -}
93 -
94 -xxv_kill_pid() {
95 -
96 - # After unclear stop, xxvd.pid will not removed, fixed with next line
97 - if [ ! -x /etc/init.d/root ]; then
98 - if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]; then
99 - rm ${PIDFILE}
100 - killall xxvd 2> /dev/null
101 - fi
102 - fi
103 -
104 -}
105 -
106 -xxv_kill_initfile() {
107 -
108 - # After unclear stop, init file in /var/lib/init.d/started/ still not removed
109 -
110 - if [ ! -x /etc/init.d/root ]; then
111 - if [ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]; then
112 - rm /var/lib/init.d/started/xxv
113 - /etc/init.d/xxv zap
114 - killall xxvd 2> /dev/null
115 - fi
116 - fi
117 -
118 -}
119 -
120 -start() {
121 - check_vdradmin
122 - xxv_logger
123 -
124 - ebegin "Start xxv"
125 - echo
126 - einfo "xxv running as user: ${RUNAS_USER}"
127 - einfo "Verbose Level: ${VERBOSE}"
128 -
129 - start-stop-daemon --nicelevel 15 --pidfile ${PIDFILE} --start -u ${RUNAS_USER} --exec ${XXV_BIN} -- \
130 - -configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
131 - eend $?
132 -}
133 -
134 -
135 -stop() {
136 -
137 - ebegin "Stopping xxvd"
138 - start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
139 -
140 - xxv_kill_pid
141 - xxv_kill_initfile
142 -
143 - eend $?
144 -}
145 -
146 -#restart() {
147 -
148 -# xxv_kill_pid
149 -# xxv_kill_initfile
150 -
151 -# svc_stop
152 -# svc_start
153 -#}
154
155 diff --git a/www-misc/xxv/files/xxvd-1.0.cfg b/www-misc/xxv/files/xxvd-1.0.cfg
156 deleted file mode 100644
157 index b18f899ba581..000000000000
158 --- a/www-misc/xxv/files/xxvd-1.0.cfg
159 +++ /dev/null
160 @@ -1,162 +0,0 @@
161 -[AUTOTIMER]
162 -active=y
163 -exclude=POS > 250
164 -interval=300
165 -
166 -[CHANNELS]
167 -empty=n
168 -file=/etc/vdr/channels.conf
169 -filterCA=0,1,2,3,4
170 -interval=300
171 -stripCH=short,long;provider
172 -
173 -[EPG]
174 -epgfile=/var/vdr/epg.data
175 -epgimages=/var/vdr/video/epgimages
176 -interval=300
177 -periods=12:00,18:00,20:20,22:00,23:00,00:00,02:00,04:00
178 -restart=3
179 -timeframe=2
180 -
181 -[GRAB]
182 -file=/tmp/live.jpg
183 -font=VeraBI.ttf
184 -imgfontsize=12
185 -imgquality=90
186 -imgtext=[?- i = channel.split(" ") -?][[? i.shift ?]] [? i.join(" ") ?]: [? event.Title ?]
187 -vpos=20
188 -xsize=480
189 -ysize=360
190 -
191 -[General]
192 -DSN=DBI:mysql:database=xxv;host=localhost;port=3306
193 -Language=de_DE
194 -PWD=xpix97
195 -USR=xpix
196 -initscript=/etc/init.d/xxv
197 -
198 -[HTTPD]
199 -Clients=1000
200 -HtmlRoot=html
201 -Port=8080
202 -StartPage=schema
203 -active=y
204 -
205 -[INTERFACE]
206 -Clients=5
207 -Port=8002
208 -active=y
209 -
210 -[LOGREAD]
211 -active=y
212 -rows=100
213 -syslog=/var/log/syslog
214 -tail=/usr/bin/tail
215 -
216 -[MUSIC]
217 -active=y
218 -clients=5
219 -coverimages=/var/cache/xxv/cover
220 -host=192.168.0.23
221 -path=/var/lib/video.00/MUSIC
222 -port=8100
223 -proxy=
224 -
225 -[NEWS::JABBER]
226 -active=n
227 -level=1
228 -passwd=password
229 -receiveUser=receiveUser@××××××.org
230 -user=newsxxv@××××××.org
231 -
232 -[NEWS::MAIL]
233 -active=n
234 -address=xxv@×××××××.com
235 -interval=6
236 -level=1
237 -smtp=smtp.googlemail.com
238 -spwd=password
239 -susr=user
240 -
241 -[NEWS::RSS]
242 -active=y
243 -level=1
244 -
245 -[NEWS::VDR]
246 -active=y
247 -level=1
248 -
249 -[RECORDS]
250 -commandfile=/etc/vdr/reccmds.conf
251 -interval=600
252 -previewbinary=/usr/bin/vdr2jpeg
253 -previewcommand=vdr2jpeg
254 -previewcount=3
255 -previewimages=/var/cache/xxv/preview
256 -previewlistthumbs=n
257 -previewlog=/var/log/xxv/xxvd_mplayer.log
258 -vfat=n
259 -videodir=/var/vdr/video
260 -
261 -[REMOTE]
262 -active=y
263 -commands=/etc/vdr/commands.conf
264 -
265 -[REPORT]
266 -active=y
267 -host=www.dyndns.org
268 -interval=6
269 -
270 -[ROBOT]
271 -active=y
272 -interval=3600
273 -
274 -[STATUS]
275 -active=y
276 -dfBinary=/bin/df
277 -font=VeraBI.ttf
278 -history=1
279 -interval=15
280 -wcBinary=/usr/bin/wc
281 -whoBinary=/usr/bin/who
282 -
283 -[STREAM]
284 -host=192.168.0.23
285 -netvideo=\\192.168.0.23\video
286 -
287 -[SVDRP]
288 -VdrHost=localhost
289 -VdrPort=2001
290 -
291 -[TELNET]
292 -Clients=5
293 -Port=8001
294 -active=y
295 -
296 -[TIMERS]
297 -DVBCards=1
298 -Lifetime=50
299 -Priority=50
300 -afterminutes=5
301 -deactive=y
302 -file=/etc/vdr/timers.conf
303 -interval=300
304 -prevminutes=1
305 -
306 -[USER]
307 -active=y
308 -noAuth=192.168.0.0/24, 127.0.0.1/32
309 -tempimages=/var/cache/xxv/temp
310 -withAuth=192.168.1.0/24
311 -
312 -[VTX]
313 -active=y
314 -cache=packed
315 -dir=/var/cache/vdr/vtx
316 -vtximages=./share/vtx
317 -
318 -[WAPD]
319 -Clients=5
320 -Port=8085
321 -WMLRoot=/usr/share/xxv-0.91_pre1126/wml
322 -active=y
323
324 diff --git a/www-misc/xxv/files/xxvd-logrotate b/www-misc/xxv/files/xxvd-logrotate
325 deleted file mode 100644
326 index 23854f73b086..000000000000
327 --- a/www-misc/xxv/files/xxvd-logrotate
328 +++ /dev/null
329 @@ -1,26 +0,0 @@
330 -# Copyright 1999-2021 Gentoo Authors
331 -# Distributed under the terms of the GNU General Public License v2
332 -
333 -/var/log/xxv/xxvd.log {
334 - compress
335 - daily
336 - dateext
337 - maxage 365
338 - rotate 99
339 - size +4096k
340 - notifempty
341 - missingok
342 - copytruncate
343 -}
344 -
345 -/var/log/xxv/xxvd_mplayer.log {
346 - compress
347 - daily
348 - dateext
349 - maxage 365
350 - rotate 99
351 - size +4096k
352 - notifempty
353 - missingok
354 - copytruncate
355 -}
356
357 diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml
358 deleted file mode 100644
359 index 146baa728576..000000000000
360 --- a/www-misc/xxv/metadata.xml
361 +++ /dev/null
362 @@ -1,9 +0,0 @@
363 -<?xml version="1.0" encoding="UTF-8"?>
364 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
365 -<pkgmetadata>
366 - <!-- maintainer-needed -->
367 - <use>
368 - <flag name="themes">Enable more themes via
369 - <pkg>x11-themes/xxv-skins</pkg></flag>
370 - </use>
371 -</pkgmetadata>
372
373 diff --git a/www-misc/xxv/xxv-1.6.1-r3.ebuild b/www-misc/xxv/xxv-1.6.1-r3.ebuild
374 deleted file mode 100644
375 index 13b7f874d3a9..000000000000
376 --- a/www-misc/xxv/xxv-1.6.1-r3.ebuild
377 +++ /dev/null
378 @@ -1,190 +0,0 @@
379 -# Copyright 1999-2021 Gentoo Authors
380 -# Distributed under the terms of the GNU General Public License v2
381 -
382 -EAPI="5"
383 -
384 -inherit eutils
385 -
386 -VERSION="718" # every bump, new version
387 -
388 -DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
389 -HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
390 -SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
391 - mirror://gentoo/${P}.tgz"
392 -
393 -LICENSE="GPL-2"
394 -SLOT="0"
395 -KEYWORDS="~amd64 ~x86"
396 -IUSE="mplayer themes"
397 -
398 -RDEPEND=">=media-video/vdr-1.2.6
399 - media-video/vdr2jpeg
400 - media-fonts/corefonts
401 - virtual/mysql
402 - dev-perl/CGI
403 - virtual/perl-Digest-MD5
404 - virtual/perl-Getopt-Long
405 - virtual/perl-MIME-Base64
406 - virtual/perl-Time-HiRes
407 - virtual/perl-IO-Compress
408 - dev-perl/Config-Tiny
409 - dev-perl/Date-Manip
410 - dev-perl/DBD-mysql
411 - dev-perl/DBI
412 - dev-perl/Digest-HMAC
413 - dev-perl/Encode-Detect
414 - dev-perl/Event
415 - dev-perl/Font-TTF
416 - dev-perl/GD[png(+),gif(+)]
417 - dev-perl/IO-Socket-INET6
418 - dev-perl/JSON
419 - dev-perl/JSON-XS
420 - dev-perl/Linux-Inotify2
421 - dev-perl/Locale-gettext
422 - dev-perl/MP3-Info
423 - dev-perl/Net-Amazon
424 - dev-perl/Net-Telnet
425 - dev-perl/Net-XMPP
426 - dev-perl/Proc-ProcessTable
427 - dev-perl/SOAP-Lite
428 - dev-perl/txt2html
429 - dev-perl/Template-GD
430 - dev-perl/Template-Toolkit
431 - dev-perl/XML-RSS
432 - themes? ( >=x11-themes/${PN}-skins-1.6 )"
433 -
434 -PDEPEND="mplayer? ( media-video/mplayer )"
435 -
436 -SHAREDIR="/usr/share/${PN}"
437 -LIBDIR="/usr/lib/${PN}"
438 -
439 -DB_VERS="32"
440 -
441 -db_update_check() {
442 -
443 - DB_VERS_OLD="`cat /var/db/pkg/www-misc/xxv-*/xxv-*.ebuild | grep DB_VERS | head -n 1 | cut -c10-11`"
444 -
445 - if [ "${DB_VERS_OLD}" -lt "${DB_VERS}" ]; then
446 - echo
447 - elog "An update of the XXV Database is necessary !!!"
448 - echo
449 - elog "\tcd ${SHAREDIR}/contrib"
450 - echo
451 - elog "\tIt is really important to edit the create-database.sql file first"
452 - elog "\tdue to UTF-8 Support changes in the MySQL DB !!!"
453 - echo
454 - elog "\tafter this run ./update-xxv -h for more info"
455 - echo
456 - else
457 - echo
458 - elog "If this is a new install"
459 - elog "You have to create an empty DB for XXV"
460 - echo
461 - elog "do this by:"
462 - elog "cd ${SHAREDIR}/contrib"
463 - eerror "read the README"
464 - elog "For UTF-8 support it is really important to"
465 - elog "edit create-database.sql file first and run"
466 - elog "emerge --config ${PN}"
467 - elog "afterwards"
468 - echo
469 - elog "Set your own language in"
470 - elog "${SHAREDIR}/locale"
471 - echo
472 - elog "The default user/password is:"
473 - elog "User/Password: xxv:xxv"
474 - elog "You should change it immediately!"
475 - echo
476 - eerror "edit /etc/xxv/xxvd.cfg !"
477 - fi
478 -}
479 -
480 -pkg_setup() {
481 -
482 - if ! has_version "www-misc/${PN}"; then
483 - echo
484 - einfo "After you install xxv the very first time you should consider to read"
485 - einfo "http://www.vdr-wiki.de/wiki/index.php/Xxv (German only)"
486 - echo
487 - fi
488 -
489 - db_update_check
490 -}
491 -
492 -src_prepare() {
493 -
494 - sed -i "${S}"/bin/xxvd \
495 - -e "s:debian:Gentoo:" \
496 - -e "s:/var/log/xxvd.log:/var/log/xxv/xxvd.log:" \
497 - -e "s:/var/run/xxvd.pid:/var/run/xxv/xxvd.pid:" \
498 - -e "s:\$RealBin/../lib:${LIBDIR}:" \
499 - -e "s:\$RealBin/../locale:${SHAREDIR}/locale:" \
500 - -e "s:\$RealBin/../lib/XXV/MODULES:${LIBDIR}/XXV/MODULES:" \
501 - -e "s:\$RealBin/../etc/xxvd.cfg:/etc/xxv/xxvd.cfg:" \
502 - -e "s:\$RealBin/../doc:/usr/share/doc/${P}:" \
503 - -e "s:HTMLDIR => \"\$RealBin/../:HTMLDIR => \"${SHAREDIR}/skins:" \
504 - -e "s:\$RealBin/../share/vtx:${SHAREDIR}/vtx:" \
505 - -e "s:\$Real Bin/../lib/XXV/OUTPUT:${LIBDIR}/XXV/OUTPUT:" \
506 - -e "s:\$RealBin/../share/news:${SHAREDIR}/news:" \
507 - -e "s:\$RealBin/../contrib:${SHAREDIR}/contrib:" \
508 - -e "s:\$RealBin/../share/fonts/ttf-bitstream-vera:/usr/share/fonts/corefonts:" \
509 - -e "s:\$RealBin/../share/xmltv:${SHAREDIR}/xmltv:"
510 -
511 - sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl
512 -}
513 -
514 -src_install() {
515 -
516 - newinitd "${FILESDIR}"/xxv.utf8-v5 xxv
517 -
518 - dobin bin/xxvd
519 -
520 - insinto /etc/"${PN}"
521 - newins "${FILESDIR}"/xxvd-1.0.cfg xxvd.cfg
522 - chown vdr:vdr "${D}"/etc/"${PN}"/xxvd.cfg
523 -
524 - insinto /etc/logrotate.d
525 - newins "${FILESDIR}"/xxvd-logrotate xxvd
526 -
527 - diropts -m755 -ovdr -gvdr
528 - keepdir /var/cache/xxv
529 - keepdir /var/run/xxv
530 - keepdir /var/log/xxv
531 -
532 - insinto "${LIBDIR}"
533 - doins -r "${S}"/lib/*
534 -
535 - insinto "${SHAREDIR}"
536 - doins -r "${S}"/share/{news,xmltv}
537 -
538 - insinto "${SHAREDIR}"/locale
539 - doins -r "${S}"/locale/*
540 - fperms 0755 "${SHAREDIR}"/locale/xgettext.pl
541 -
542 - insinto "${SHAREDIR}"/contrib
543 - doins -r "${S}"/contrib/*
544 - fperms 0755 "${SHAREDIR}"/contrib/update-xxv
545 -
546 - insinto "${SHAREDIR}"/skins
547 - doins -r "${S}"/{html,wml}
548 - doins "${S}"/doc/docu.tmpl
549 -
550 - cd "${S}"/doc
551 - insinto /usr/share/doc/"${P}"
552 - doins docu.tmpl CHANGELOG README
553 - fowners vdr:vdr /usr/share/doc/"${P}"
554 -
555 - doman xxvd.1
556 -}
557 -
558 -pkg_config() {
559 -
560 - cd "${ROOT}"/"${SHAREDIR}"
561 - cat ./contrib/create-database.sql | mysql -u root -p
562 -}
563 -
564 -pkg_postrm() {
565 -
566 - einfo "Cleanup for old "${P}" files"
567 - rm -r /usr/share/doc/"${P}"
568 -}