new (unmasked) snapshot; utf-8 support; cleanup hardmasked versions

Package-Manager: portage-2.1.6.7/cvs/Linux i686

5 files changed, 48 insertions, 223 deletions

diff --git a/net-www/xxv/ChangeLog b/net-www/xxv/ChangeLog
index f3b8c4d12563..53f7c217bde7 100644
--- a/net-www/xxv/ChangeLog
+++ b/net-www/xxv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/xxv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/ChangeLog,v 1.14 2009/01/05 00:09:34 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/ChangeLog,v 1.15 2009/04/06 01:05:50 hd_brummy Exp $
+
+*xxv-1.2.1402 (06 Apr 2009)
+
+  06 Apr 2009; Joerg Bornkessel <hd_brummy@gentoo.org> -files/xxv.utf8,
+  +files/xxv.utf8-v2, -xxv-1.2.1359.ebuild, -xxv-1.2.1383.ebuild,
+  +xxv-1.2.1402.ebuild:
+  new (unmasked) snapshot; utf-8 support; cleanup hardmasked versions
 
   05 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> -xxv-1.2.1308.ebuild,
   -xxv-1.2.1315.ebuild:
diff --git a/net-www/xxv/Manifest b/net-www/xxv/Manifest
index 13b265348a71..92caba1b2978 100644
--- a/net-www/xxv/Manifest
+++ b/net-www/xxv/Manifest
@@ -1,15 +1,24 @@
+-----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 1952 RMD160 4ddb6ee2c1ee6ffbbd479987900b9ec0b1886fd7 SHA1 b8fe0259c1d8284f6f45076f7a00a4edc09cd1a8 SHA256 3e76aa3536dcf3c38849f1ccf58e2f34ed4746fb80d9cb55e4f274d1508d1229
+AUX xxv.utf8-v2 2079 RMD160 79336e99ae669fe3d4140a54ad1aac5287ca7e54 SHA1 7f9e025e26558eb3286b79cc469b952b631296ce SHA256 bdc0b745b499c13bfe369edec6428faad1f5c20a5b25a6b055f57d7695d82920
 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.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.1402.tgz 964633 RMD160 d76eecc8c73ef768ca66a54d2c893382621d44ea SHA1 eed6d83a7b46f606596f526958395caccad5cef6 SHA256 6d3f76ddd3831791b3faf828e1f8a5fc29909d2ce31b86f93fbc2e22657b726d
 DIST xxv-1.2.tgz 921715 RMD160 9b621719b78fc64616fcd75a753e32a8c18ab9db SHA1 cf6d6fd25481f004ad4fab333790f9d5d8024c83 SHA256 699f2ad9ec8b608758290fcf52bdab26a972f89dd2c0e5b22edc8dc647930b32
 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.1359.ebuild 4501 RMD160 1b47926fc6c6fd4aba70b19423b3b6285e1bc4cc SHA1 78c4422d02acc4dcf3f08747cc08114c5f4df5ac SHA256 18a0777ffee2762476e743cadc50c872be6bcfeda312964f4e06c2a89ae57948
-EBUILD xxv-1.2.1383.ebuild 4503 RMD160 b49bf942140a246189cd9d2904b976255bea3dca SHA1 b61d3accd8ce50895f99dfcffbe12a8ca5aace83 SHA256 b797c7bbb14b44abc16ffd3c8c2b55186a705b6282ad38006a34f2b4f4ba0633
-MISC ChangeLog 2550 RMD160 5593cf8a5a4985b9b596b2d5afab30c3ca21f0de SHA1 ddf6a691e6bddb283f33ca1eaabf0a69d9707d97 SHA256 1b80cf6218e03175c646556fb712bf2b245fd9283a9d08d85c25240312743fe9
+EBUILD xxv-1.2.1402.ebuild 4398 RMD160 8358162a7dfd5f7fcf715beee148736803f2d0e1 SHA1 7a69c441e1356cd126d8841ed11f17f5a97d0817 SHA256 296b0638e7d776fdae8fac840af4cf7c86580fb16bdf014d172abd007b0b2a0d
+MISC ChangeLog 2812 RMD160 dea7acd94a92da19014bb8c4af9d555b76f76fbd SHA1 4a9b61f142b8c6801bbfc136709f52832c5befa8 SHA256 cfb77ac5b8941602e69861792f5f5dbccbd1d56d360ea52d2fa483afd2c7b342
 MISC metadata.xml 607 RMD160 423ff4aae1b8fcfab1b50267a6d0084bea950655 SHA1 be987c97532f8a8efa4746ca36772352490e6b7f SHA256 b1dc077f8c2d9cba527f27261f18b2186275f7202e5393c367cd594b57d18037
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFJ2VV7dn07HTTCgIoRAti4AJ0fUfVEAy2YBWqF6nViUQGDibtvEQCcCrbt
+a4Alp5qKtgSyDfRYOkqeW9A=
+=2CMw
+-----END PGP SIGNATURE-----
diff --git a/net-www/xxv/files/xxv.utf8 b/net-www/xxv/files/xxv.utf8-v2
index 25806e37e569..0b9f61e6c3e0 100644
--- a/net-www/xxv/files/xxv.utf8
+++ b/net-www/xxv/files/xxv.utf8-v2
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # 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.2 2009/01/05 00:07:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/files/xxv.utf8-v2,v 1.1 2009/04/06 01:05:51 hd_brummy Exp $
 
-RUNAS_USER="root"
+RUNAS_USER="vdr"
 
 # Set Verbose Level 0 -> 5 
 VERBOSE="1"
@@ -25,10 +25,14 @@ 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
-		ebegin "VDR-Admin will Stop at first now"
-		/etc/init.d/vdradmind stop
+	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
+		logger -t xxv "vdradmin stopped by xxv initscript" 
+		logger -t xxv "xxv and vdradmin can not run on same port"
 	fi
 }
 
@@ -61,9 +65,10 @@ set_utf8_charset() {
 }
 	
 start() {
-	ebegin "Start xxv"
-#	kill_vdradmin
+	kill_vdradmin
 	set_utf8_charset
+
+	ebegin "Start xxv"
 	
 	start-stop-daemon  --nicelevel 15 --pidfile ${PIDFILE} --start -c ${RUNAS_USER} --exec ${XXV_BIN} -- \
 	${XXV_UTF8} -configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
diff --git a/net-www/xxv/xxv-1.2.1359.ebuild b/net-www/xxv/xxv-1.2.1359.ebuild
deleted file mode 100644
index 44fcfe45d9c8..000000000000
--- a/net-www/xxv/xxv-1.2.1359.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.2.1359.ebuild,v 1.2 2008/11/18 16:20:59 tove 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-1.2.1359 )"
-
-PDEPEND="mplayer? ( media-video/mplayer )"
-
-SHAREDIR="/usr/share/${PN}"
-LIBDIR="/usr/lib/${PN}"
-
-DB_VERS="30"
-
-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}"
-}
diff --git a/net-www/xxv/xxv-1.2.1383.ebuild b/net-www/xxv/xxv-1.2.1402.ebuild
index 207eb6a5dcf1..ae43c2f463dd 100644
--- a/net-www/xxv/xxv-1.2.1383.ebuild
+++ b/net-www/xxv/xxv-1.2.1402.ebuild
@@ -1,11 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.2.1402.ebuild,v 1.1 2009/04/06 01:05:50 hd_brummy Exp $
+
+EAPI="2"
 
 inherit eutils versionator
 
-MY_PV=$(get_version_component_range 3)
-MY_P="${PN}-${MY_PV}"
+#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/"
@@ -29,7 +31,7 @@ RDEPEND=">=media-video/vdr-1.2.6
 	dev-perl/Config-Tiny
 	dev-perl/Digest-HMAC
 	dev-perl/Encode-Detect
-	dev-perl/GD
+	dev-perl/GD[png,gif]
 	dev-perl/DateManip
 	dev-perl/DBD-mysql
 	dev-perl/DBI
@@ -68,6 +70,7 @@ db_update_check() {
 		elog "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
@@ -89,16 +92,9 @@ db_update_check() {
 
 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	"After you install xxv at first time you should read"
 		einfo	"http://www.vdr-wiki.de/wiki/index.php/Xxv  German only available"
 		echo
 	fi
@@ -124,18 +120,15 @@ src_unpack() {
 		-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/:"
+		-e "s:\$RealBin/../share/fonts/:/usr/share/fonts/:" \
+		-e "s:\$RealBin/../share/xmltv:${SHAREDIR}/xmltv:"
 
 	sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl
 }
 
-src_compile() {
-:
-}
-
 src_install() {
 
-	newinitd "${FILESDIR}"/xxv.utf8 xxv
+	newinitd "${FILESDIR}"/xxv.utf8-v2 xxv
 
 	dobin	bin/xxvd
 
@@ -154,7 +147,7 @@ src_install() {
 	doins -r "${S}"/lib/*
 
 	insinto "${SHAREDIR}"
-	doins -r "${S}"/share/news
+	doins -r "${S}"/share/{news,xmltv}
 
 	insinto "${SHAREDIR}"/locale
 	doins -r "${S}"/locale/*