new test snap, new utf8 initscript, cleanup, fixed src_uri to berlios mirror

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.21-xen-main-r1 i686

6 files changed, 249 insertions, 54 deletions

diff --git a/net-www/xxv/ChangeLog b/net-www/xxv/ChangeLog
index 61bad5730138..e5b596300da4 100644
--- a/net-www/xxv/ChangeLog
+++ b/net-www/xxv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/xxv
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/ChangeLog,v 1.12 2008/11/18 16:20:59 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/ChangeLog,v 1.13 2009/01/05 00:07:45 hd_brummy Exp $
+
+*xxv-1.2.1383 (05 Jan 2009)
+
+  05 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/xxv.utf8,
+  xxv-1.0.1-r1.ebuild, xxv-1.2-r1.ebuild, +xxv-1.2.1383.ebuild:
+  new test snap, new utf8 initscript, cleanup, fixed src_uri to berlios
+  mirror
 
   18 Nov 2008; Torsten Veller <tove@gentoo.org> xxv-1.0.1-r1.ebuild,
   xxv-1.2-r1.ebuild, xxv-1.2.1308.ebuild, xxv-1.2.1315.ebuild,
diff --git a/net-www/xxv/Manifest b/net-www/xxv/Manifest
index ae01b2b49f48..ecb66e235922 100644
--- a/net-www/xxv/Manifest
+++ b/net-www/xxv/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xxv 1739 RMD160 e5b42c25c47633b0e26444cb0e8211a62315196c SHA1 e2e0e2314025dab06fdd345c751d54bf9c2e5e29 SHA256 fd92f028ac7ce52b16881f2c53a9ba4f009d4c74c6b96ac173a03b9ce6f107b5
 AUX xxv-1.0-logerror.patch 1477 RMD160 3795497ed97d16af9f7b10874619f567e723cc86 SHA1 712257f3d7a98da402f3c67bbd41b6bb132ff0a3 SHA256 ac8db7fb3d75be90dc33fdf427265dcd14355e572500140718fce2c731166822
-AUX xxv.utf8 1756 RMD160 41c0b773ad406e5775d511c91856a2b0b2336be3 SHA1 a7fc1b9e9c5ee29171a12483062ba0aa60c8aa73 SHA256 03ced7d35f41cb0b719b134dc93887307b6b8b907b57246fc0bd2c221b74c746
+AUX xxv.utf8 1952 RMD160 4ddb6ee2c1ee6ffbbd479987900b9ec0b1886fd7 SHA1 b8fe0259c1d8284f6f45076f7a00a4edc09cd1a8 SHA256 3e76aa3536dcf3c38849f1ccf58e2f34ed4746fb80d9cb55e4f274d1508d1229
 AUX xxvd-1.0.cfg 2257 RMD160 2f0ed9987f6a85fa4bc1a7ae68b31251f4e72b00 SHA1 f82efba3aefb1216067767e52236e119da6d65dc SHA256 a49c7c402e8c9990f84e8b3ae5207559f9dd9262075b5ab0606058ff08061016
 AUX xxvd-logrotate 477 RMD160 cf179b200bca2ba165550530c5a4dc6e3e01838f SHA1 c761c5f9a6702c674e24410660f285d7a5854aec SHA256 3f4aa0de2dd635532df74ad60074724f2dce62a7a716824dac0cdb228d868d95
 DIST xxv-1.0.1.tgz 920320 RMD160 fa71db154cb9d185e6175f21d4e2ad3fa1747cd6 SHA1 b58e81e218e47e99e9fddbdeab776201c266a044 SHA256 94a13c087e7a6d180b3e23815bd8d36b1ee5ac81fd31faa0f825d0395d8d6f78
 DIST xxv-1.2.1308.tgz 926757 RMD160 79b62ca1fe0dffe72f3a03b499b51eb989114b4f SHA1 c3966af71e66b8183bbfa8bbc16733106583dae2 SHA256 80bdcfcb8a27459b535ef3c97f00247a0a660c39da241e35ffbe7b10e32689b3
 DIST xxv-1.2.1315.tgz 939473 RMD160 6cd06684d03805ef58be09e01fd2f67c4425d362 SHA1 11d6f1464e9e6ccd8767fbbdef80e69848093205 SHA256 5dad9e09debbb299dec11c99e080335cb6e9c36541ea3d1b92aff442df31ba1f
 DIST xxv-1.2.1359.tgz 954601 RMD160 7b6c095a540e74689884cbab68c1f73c3a17a9c2 SHA1 5a58403b80e2331bc60342ee87916f56ca88da1f SHA256 f2721ef2575724133d10706c84f80e56ed86a6cab6619ec38d8e5588377b77d8
+DIST xxv-1.2.1383.tgz 960844 RMD160 54406d13416a8aab332743ebb83b75a2881acb9f SHA1 ba9715d8e36d17d5cedc7126f1a25e6f89d5bc90 SHA256 0000498347e072aff4db5b88523ff5ee04e293e19af22fec5f398284a1629c81
 DIST xxv-1.2.tgz 921715 RMD160 9b621719b78fc64616fcd75a753e32a8c18ab9db SHA1 cf6d6fd25481f004ad4fab333790f9d5d8024c83 SHA256 699f2ad9ec8b608758290fcf52bdab26a972f89dd2c0e5b22edc8dc647930b32
-EBUILD xxv-1.0.1-r1.ebuild 4453 RMD160 cd87fd86692f637c6deebeb5bd12bea27a11f1bb SHA1 207b4ec5700929d7abce26c276471f93ed861a80 SHA256 2e97a3e0fbc985a8abf48f73ad85a40105e51d4c80b9f6640252208f74992743
-EBUILD xxv-1.2-r1.ebuild 4394 RMD160 1878e409da0471d68bb6e93ce3a804b4c1268735 SHA1 59df89f3c3fc14933bf75f42def1973d47299cb1 SHA256 ed0cbb34e6a5c37c8c0896b0e813e74b219cc71284a5c9b93e3f7fc352f19590
+EBUILD xxv-1.0.1-r1.ebuild 4448 RMD160 ab54b17832f83f596b6967e67cef7a9a9093beb4 SHA1 8bf64cfe2fb374992b1ad49dba0d767448142761 SHA256 f039cbccd73a173a84621e163280414a23ec60763cd74f1bef7959978be08a2d
+EBUILD xxv-1.2-r1.ebuild 4389 RMD160 4b079383777e44974df5855d53e9b0f75462ef6f SHA1 85136757c98640760475932b0cdc19c64ec749eb SHA256 f71b90577cf6f5ec1c3c1bab124b25a3107615aac7958f721952f90bde2105e3
 EBUILD xxv-1.2.1308.ebuild 4495 RMD160 5e880e9af72e8f8002e3351e4b372044762fb2ce SHA1 51972683fcf455d670c5c10f27e3d03473842dfb SHA256 72c5f973054053530f6717ba910146ec2f6df124a3bf70ae0830da676f51e851
 EBUILD xxv-1.2.1315.ebuild 4495 RMD160 484ac826e4d68792079cc31448c50e577bc70b3e SHA1 fa1fa32537a23f1ca62d8e998c6a771e3e8796cb SHA256 df6073ea3570511ac14b8c9c0de2594c077df7bb8b9277128b113d341756e28f
 EBUILD xxv-1.2.1359.ebuild 4501 RMD160 1b47926fc6c6fd4aba70b19423b3b6285e1bc4cc SHA1 78c4422d02acc4dcf3f08747cc08114c5f4df5ac SHA256 18a0777ffee2762476e743cadc50c872be6bcfeda312964f4e06c2a89ae57948
-MISC ChangeLog 2178 RMD160 8bd5ed335af1ff3b0088ab3ac2de97c251f9fb93 SHA1 5c7344138d89bd10cac46506e5769da43a771e9d SHA256 03442ea3a978c521c759a4f72cdbdd80ef839569fb69d2de84a509537c517ba5
+EBUILD xxv-1.2.1383.ebuild 4503 RMD160 b49bf942140a246189cd9d2904b976255bea3dca SHA1 b61d3accd8ce50895f99dfcffbe12a8ca5aace83 SHA256 b797c7bbb14b44abc16ffd3c8c2b55186a705b6282ad38006a34f2b4f4ba0633
+MISC ChangeLog 2429 RMD160 72447224acb9c4f91d86c95a2dda154a261238ea SHA1 772eaa70e5247b488f102e479260a3dfc2c0d9c7 SHA256 bc62b7ec60952ad9f48309c6283a44eaf9684b4041f70814357390469bc1721d
 MISC metadata.xml 607 RMD160 423ff4aae1b8fcfab1b50267a6d0084bea950655 SHA1 be987c97532f8a8efa4746ca36772352490e6b7f SHA256 b1dc077f8c2d9cba527f27261f18b2186275f7202e5393c367cd594b57d18037
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkki610ACgkQV3J2n04EauxsyACg19G5iW+i+a/7Y2gs6wcmjwqM
-tAIAn25GPqhlYeUcul6JElPBR+OGoMCx
-=7sbg
------END PGP SIGNATURE-----
diff --git a/net-www/xxv/files/xxv.utf8 b/net-www/xxv/files/xxv.utf8
index 5956251fa761..25806e37e569 100644
--- a/net-www/xxv/files/xxv.utf8
+++ b/net-www/xxv/files/xxv.utf8
@@ -1,21 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/files/xxv.utf8,v 1.1 2008/03/11 21:48:01 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/files/xxv.utf8,v 1.2 2009/01/05 00:07:44 hd_brummy Exp $
 
-RUNAS_USER="vdr"
+RUNAS_USER="root"
+
+# Set Verbose Level 0 -> 5 
+VERBOSE="1"
+
+#set -xv
 
 # some fixed Path
 CONFIGFILE="/etc/xxv/xxvd.cfg"
 PIDFILE="/var/run/xxv/xxvd.pid"
 XXV_BIN="/usr/bin/xxvd"
 
-LANGUAGE="de_DE.utf8"
-
-# Set Verbose Level 0 -> 5 
-VERBOSE="3"
-
-#set -xv
 
 depend() {
 	need vdr
@@ -24,54 +23,62 @@ depend() {
 
 kill_vdradmin() {
 
-		# Check at first, is VDR-Admin running
-		# Stopping, while running on same ports
-		# You can comment the next 4 Lines if you running VDR-Admind on different Ports
-		if [ -f /var/run/vdradmind.pid ] ; then
+	# Check at first, is VDR-Admin running
+	# Stopping, while running on same ports
+	# You can comment the next 4 Lines if you running VDR-Admind on different Ports
+	if [ -f /var/run/vdradmind.pid ] ; then
 		ebegin "VDR-Admin will Stop at first now"
 		/etc/init.d/vdradmind stop
-		fi
+	fi
 }
 
 xxv_kill_pid() {
 
-		# After unclear stop, xxvd.pid will not removed, fixed with next line
-		if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] ; then
-			rm ${PIDFILE}
-			killall xxvd 2>&1 > /dev/null
-		fi
+	# After unclear stop, xxvd.pid will not removed, fixed with next line
+	if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] ; then
+		rm ${PIDFILE}
+		killall xxvd 2>&1 > /dev/null
+	fi
 }
 
 xxv_kill_initfile() {
 
-		# After unclear stop, init file in /var/lib/init.d/started/ still not removed
-		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>&1 > /dev/null
-		fi
+	# After unclear stop, init file in /var/lib/init.d/started/ still not removed
+	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>&1 > /dev/null
+	fi
+}
+
+set_utf8_charset() {
+	local capfile=/usr/share/vdr/capabilities.sh
+	[ -e "${capfile}" ] && . ${capfile}
+	if [ "${CAP_UTF8}" = "1" -o "${VDR_CAN_HANDLE_UTF8}" = "yes" ]; then
+		# do not clean out utf8
+		XXV_UTF8="-utf8"
+	fi
 }
 	
 start() {
-
-	kill_vdradmin
-
-	# Finaly start XXV :)
-	export LANG="${LANGUAGE}"
 	ebegin "Start xxv"
+#	kill_vdradmin
+	set_utf8_charset
+	
 	start-stop-daemon  --nicelevel 15 --pidfile ${PIDFILE} --start -c ${RUNAS_USER} --exec ${XXV_BIN} -- \
-	-configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE} --utf8
+	${XXV_UTF8} -configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
 	eend $?
 }
 
 
 stop() {
 
-	ebegin "Stopping xxv"
+	ebegin "Stopping xxvd"
 	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 
 	xxv_kill_pid
 	xxv_kill_initfile
+#	killall xxvd 2>&1 > /dev/null
 
 	eend $?
 }
diff --git a/net-www/xxv/xxv-1.0.1-r1.ebuild b/net-www/xxv/xxv-1.0.1-r1.ebuild
index e5b4bba10d4a..774301e48824 100644
--- a/net-www/xxv/xxv-1.0.1-r1.ebuild
+++ b/net-www/xxv/xxv-1.0.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.0.1-r1.ebuild,v 1.3 2008/11/18 16:20:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.0.1-r1.ebuild,v 1.4 2009/01/05 00:07:45 hd_brummy Exp $
 
 inherit eutils
 
 DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
 HOMEPAGE="http://xxv.berlios.de/content/view/37/1/"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tgz"
+SRC_URI="mirror://berlios/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-www/xxv/xxv-1.2-r1.ebuild b/net-www/xxv/xxv-1.2-r1.ebuild
index e299e927628b..11bb1108aa39 100644
--- a/net-www/xxv/xxv-1.2-r1.ebuild
+++ b/net-www/xxv/xxv-1.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.2-r1.ebuild,v 1.2 2008/11/18 16:20:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.2-r1.ebuild,v 1.3 2009/01/05 00:07:45 hd_brummy Exp $
 
 inherit eutils
 
 DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
 HOMEPAGE="http://xxv.berlios.de/content/view/40/1/"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tgz"
+SRC_URI="mirror://berlios/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-www/xxv/xxv-1.2.1383.ebuild b/net-www/xxv/xxv-1.2.1383.ebuild
new file mode 100644
index 000000000000..207eb6a5dcf1
--- /dev/null
+++ b/net-www/xxv/xxv-1.2.1383.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.2.1383.ebuild,v 1.1 2009/01/05 00:07:45 hd_brummy Exp $
+
+inherit eutils versionator
+
+MY_PV=$(get_version_component_range 3)
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
+HOMEPAGE="http://xxv.berlios.de/content/view/40/1/"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="mplayer themes"
+
+RDEPEND=">=media-video/vdr-1.2.6
+	media-video/vdr2jpeg
+	media-fonts/ttf-bitstream-vera
+	dev-db/mysql
+	virtual/perl-CGI
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-HiRes
+	virtual/perl-Compress-Zlib
+	dev-perl/Config-Tiny
+	dev-perl/Digest-HMAC
+	dev-perl/Encode-Detect
+	dev-perl/GD
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/Event
+	dev-perl/IO-Socket-INET6
+	dev-perl/JSON
+	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/TextToHTML
+	dev-perl/Template-Toolkit
+	dev-perl/SOAP-Lite
+	dev-perl/XML-RSS
+	themes? ( >=x11-themes/${PN}-skins-${PV} )"
+
+PDEPEND="mplayer? ( media-video/mplayer )"
+
+SHAREDIR="/usr/share/${PN}"
+LIBDIR="/usr/lib/${PN}"
+
+DB_VERS="31"
+
+db_update_check() {
+
+	DB_VERS_OLD="`cat /var/db/pkg/net-www/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 XXV Database is needed !!!"
+		echo
+		elog "cd ${SHAREDIR}/contrib"
+		elog "run ./update-xxv -h for more info"
+		echo
+	else
+		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 "edit create-database.sql and run"
+		elog "emerge --config ${PN}"
+		echo
+		elog "Set your own language in"
+		elog "${SHAREDIR}/locale"
+		echo
+		elog "For First Time Login in Browser use:"
+		elog "Pass:Login = xxv:xxv"
+		echo
+		eerror "edit /etc/xxv/xxvd.cfg !"
+	fi
+}
+
+pkg_setup() {
+
+	if ! built_with_use dev-perl/GD png gif ; then
+		echo
+		eerror "Please recompile dev-perl/GD with"
+		eerror "USE=\"png gif\""
+		die "dev-perl/GD need png and gif support"
+	fi
+
+	if ! has_version "net-www/${PN}"; then
+		echo
+		einfo	"Before you install xxv at first time you should read"
+		einfo	"http://www.vdr-wiki.de/wiki/index.php/Xxv  German only available"
+		echo
+	fi
+
+	db_update_check
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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:\$RealBin/../lib/XXV/OUTPUT:${LIBDIR}/XXV/OUTPUT:" \
+		-e "s:\$RealBin/../share/news:${SHAREDIR}/news:" \
+		-e "s:\$RealBin/../contrib:${SHAREDIR}/contrib:" \
+		-e "s:\$RealBin/../share/fonts/:/usr/share/fonts/:"
+
+	sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl
+}
+
+src_compile() {
+:
+}
+
+src_install() {
+
+	newinitd "${FILESDIR}"/xxv.utf8 xxv
+
+	dobin	bin/xxvd
+
+	insinto /etc/"${PN}"
+	newins "${FILESDIR}"/xxvd-1.0.cfg 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
+
+	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 LIESMICH NEWS README TUTORIAL.txt.gz
+	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}"
+}