version bump; some eapi=2 fixes in older ebuilds

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

6 files changed, 305 insertions, 16 deletions

diff --git a/www-misc/xxv/ChangeLog b/www-misc/xxv/ChangeLog
index 0692497da898..4e6bd55b1b3d 100644
--- a/www-misc/xxv/ChangeLog
+++ b/www-misc/xxv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/xxv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.8 2009/07/19 18:08:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.9 2009/08/16 18:27:55 hd_brummy Exp $
+
+*xxv-1.4 (16 Aug 2009)
+
+  16 Aug 2009; Joerg Bornkessel <hd_brummy@gentoo.org> xxv-1.2.1402.ebuild,
+  xxv-1.3.ebuild, +xxv-1.4.ebuild, +files/xxv.utf8-v5:
+  version bump; some eapi=2 fixes in older ebuilds
 
   19 Jul 2009; Torsten Veller <tove@gentoo.org> xxv-1.0.1-r1.ebuild,
   xxv-1.2-r1.ebuild, xxv-1.2.1402.ebuild, xxv-1.3.ebuild, xxv-1.3.1.ebuild:
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index b4f27e49d5f2..4ae142c35d0e 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -6,6 +6,7 @@ AUX xxv-1.0-logerror.patch 1477 RMD160 3795497ed97d16af9f7b10874619f567e723cc86
 AUX xxv.utf8-v2 2080 RMD160 61b893d242635d00a6c2d079b57f7949d09a3e65 SHA1 06d77b27898d2d0e2dcbe121aa678bd9eb9df991 SHA256 c12eeef4f65971c8084b2d698ce276f94ca3b101f5c48d8f72189c1a2f96b73a
 AUX xxv.utf8-v3 2425 RMD160 a6e6ac528b437af2f373e792745418e1ded214d6 SHA1 819051dc5d2636553a2681093d0596da23dcd9d2 SHA256 55d44e9e875dfa261da45b269f54615b7e0d8189d1517fa9800897a4ffb518f2
 AUX xxv.utf8-v4 2402 RMD160 0383b510616c4606fc75ee614524ccd04bb5d724 SHA1 76054d84354fde02982c114d03cafd9838a9fd26 SHA256 e5d22a0640a84332f6c5fad74650174f56ffbc900a60d0be48165fe4164bec84
+AUX xxv.utf8-v5 2113 RMD160 3dae7d1af8330d1886795c22c0f4658a8ab9aca5 SHA1 db69c5519239eb6243bd16b7966647c748baff53 SHA256 05d9f66e2bfc50231e393e861e63eb8cbec0b2c234796ae517db0dbfa08eada0
 AUX xxvd-1.0.cfg 2257 RMD160 2f0ed9987f6a85fa4bc1a7ae68b31251f4e72b00 SHA1 f82efba3aefb1216067767e52236e119da6d65dc SHA256 a49c7c402e8c9990f84e8b3ae5207559f9dd9262075b5ab0606058ff08061016
 AUX xxvd-logrotate 478 RMD160 5945c1c40750b594dce1bec7ba8cf9cc7aa43ea0 SHA1 450c4e18023716851a86a1afc8a8ce749a9e3513 SHA256 0b16eda74181e54f0beb5a3de92d2e12288270bc891e378d61a076274e53f11a
 DIST xxv-1.0.1.tgz 920320 RMD160 fa71db154cb9d185e6175f21d4e2ad3fa1747cd6 SHA1 b58e81e218e47e99e9fddbdeab776201c266a044 SHA256 94a13c087e7a6d180b3e23815bd8d36b1ee5ac81fd31faa0f825d0395d8d6f78
@@ -13,17 +14,20 @@ DIST xxv-1.2.1402.tgz 964633 RMD160 d76eecc8c73ef768ca66a54d2c893382621d44ea SHA
 DIST xxv-1.2.tgz 921715 RMD160 9b621719b78fc64616fcd75a753e32a8c18ab9db SHA1 cf6d6fd25481f004ad4fab333790f9d5d8024c83 SHA256 699f2ad9ec8b608758290fcf52bdab26a972f89dd2c0e5b22edc8dc647930b32
 DIST xxv-1.3.1.tgz 958202 RMD160 5fcf8aa3bd09fd18f1a48bd8d94113b2fd149904 SHA1 d9fca09c84131c82ff170d81c0e29f57274240ea SHA256 488d39f10731c793bf656a0f280bb71f577534317475ac249d86dfbe91c4ca29
 DIST xxv-1.3.tgz 961834 RMD160 2f54eb32c0b08c19fe6c8ab690f744fe62282787 SHA1 b04f2a823ccfb8755c4dde8345ad8b0002f1fc76 SHA256 a8ac13c242b99f4d5d42fb2a51ff48be8367af40ca38066386eb01c70eb1126a
+DIST xxv-1.4.tgz 915079 RMD160 af230b55e988139cc8144a6e9493a30f8277a1e6 SHA1 ff64ae9d763df2fdc83bf80a8f647e1b35ec07a2 SHA256 ae551cfc315e7b9b6035597f9bf580422e6dc71218a84c021a2855966c72ca79
 EBUILD xxv-1.0.1-r1.ebuild 4443 RMD160 dc4a0658f3304eec16e1240987c8a3e84447e936 SHA1 dfd1f039f89dd655c52948cb08f39a9f772e11de SHA256 2a0e6c0055a6432f2a0000a7913928ca2d57c6d1b6efe558d1c28fcb572eed11
 EBUILD xxv-1.2-r1.ebuild 4385 RMD160 d20e906bc235c568023e368e3a1fc61dd1ac3396 SHA1 f9293573a02a9f1bae7b755497815fd61a8fda5e SHA256 431b9d17f609caf9209a177c66b3d0cd7d1c57b074d30aaff06d5f2330406529
-EBUILD xxv-1.2.1402.ebuild 4394 RMD160 e20f7bf92d3ca0be1a62e223c0ee862bd1b869b4 SHA1 9c5ea6b6f41cdeeb2c33657186252b4d9b978a93 SHA256 8edafee2732d9b2dc903dc8ee1811876f6158beb2d7daee35c09a3cb9e935a7a
+EBUILD xxv-1.2.1402.ebuild 4376 RMD160 e4c02b8f185721b8342ca630b1f470af0d45de52 SHA1 e000dfc654f799eb2d0727262da58662581e5a09 SHA256 3b54839d7e03f723a34101c80ce5d22f08c60ffbc096e69d0e8f2e65f3282d69
 EBUILD xxv-1.3.1.ebuild 4489 RMD160 ae6b072b545fd2a291603cde5b3d4146da0ffdd1 SHA1 b08ac6be425f6203785fbe694cd50a1acfa6bd36 SHA256 1bf5b61d2714aff0661764e2a6a42076865bbe40609bc238e4b07056117134ff
-EBUILD xxv-1.3.ebuild 4311 RMD160 8425004ac0e73b6fc681c1073ce0091dbb55164c SHA1 64054d8395356ee3a9547ab01aa1b907c0b54185 SHA256 5edffcab8e7c63032309fdabdd6dad32fd33f8321f5d297ad8ea24ea4384e1b2
-MISC ChangeLog 4066 RMD160 042af1423fc0380515bcc6b67efb9eb5ffbf70dd SHA1 59d9c4c1c57d624bf1d333352269e55376897ff9 SHA256 61598cd150e0b55db4fef304d83deaf49e9c1a83df3a327498da8bc87b8cdf10
+EBUILD xxv-1.3.ebuild 4293 RMD160 a4d379a49e1b0415d94c2e305c813eabbfe3d350 SHA1 7fd214ab1b22f0799d9776a1652be69b868e2dfc SHA256 353af706e3376c9df8304f0112d7c848f00b970affd9f7861a45556dde82867a
+EBUILD xxv-1.4.ebuild 4462 RMD160 fe0618dcdbd5ed232dea2483c5b6c6c54d284821 SHA1 a8bef42a393e54224a0ba40e44fead102fe0af37 SHA256 19a1bda55a2a326111bf0a520cce739385892611bec9a07ff2d1c75c85baf16e
+MISC ChangeLog 4278 RMD160 c954a41b6c3e57e24d13ee0f7d390314177aca67 SHA1 15632959fa0f7d523aee38912882f104344f83d5 SHA256 1c2a1b3e0e579de312b8cd6c38a85667af0e77fba22de58ccc1277fd7c369000
 MISC metadata.xml 607 RMD160 423ff4aae1b8fcfab1b50267a6d0084bea950655 SHA1 be987c97532f8a8efa4746ca36772352490e6b7f SHA256 b1dc077f8c2d9cba527f27261f18b2186275f7202e5393c367cd594b57d18037
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkpjYQwACgkQV3J2n04EauyhFQCgu1XqgSFxx/b6T02Qmbzkqvix
-K5UAn2ljbycEq8bEpJWbqTfYvoWAtjvN
-=5EBo
+iD8DBQFKiE9/dn07HTTCgIoRAlChAJ97F4A33Gz5dSf3rqJ7i5Ehwk6o9gCfThuI
+jwRxps6LEqdo/+Lp+oMzEW0=
+=nRH9
 -----END PGP SIGNATURE-----
diff --git a/www-misc/xxv/files/xxv.utf8-v5 b/www-misc/xxv/files/xxv.utf8-v5
new file mode 100644
index 000000000000..603543f568db
--- /dev/null
+++ b/www-misc/xxv/files/xxv.utf8-v5
@@ -0,0 +1,101 @@
+#!/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/www-misc/xxv/files/xxv.utf8-v5,v 1.1 2009/08/16 18:27:55 hd_brummy Exp $
+
+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 -c ${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/xxv-1.2.1402.ebuild b/www-misc/xxv/xxv-1.2.1402.ebuild
index 1dbb66809584..5732b42adb92 100644
--- a/www-misc/xxv/xxv-1.2.1402.ebuild
+++ b/www-misc/xxv/xxv-1.2.1402.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.2.1402.ebuild,v 1.4 2009/07/19 18:08:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.2.1402.ebuild,v 1.5 2009/08/16 18:27:55 hd_brummy Exp $
 
 EAPI="2"
 
@@ -102,9 +102,7 @@ pkg_setup() {
 	db_update_check
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 
 	sed -i "${S}"/bin/xxvd \
 		-e "s:debian:Gentoo:" \
diff --git a/www-misc/xxv/xxv-1.3.ebuild b/www-misc/xxv/xxv-1.3.ebuild
index 0782ca28cf22..aa1d328cc309 100644
--- a/www-misc/xxv/xxv-1.3.ebuild
+++ b/www-misc/xxv/xxv-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.3.ebuild,v 1.2 2009/07/19 18:08:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.3.ebuild,v 1.3 2009/08/16 18:27:55 hd_brummy Exp $
 
 EAPI="2"
 
@@ -99,9 +99,7 @@ pkg_setup() {
 	db_update_check
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 
 	sed -i "${S}"/bin/xxvd \
 		-e "s:debian:Gentoo:" \
diff --git a/www-misc/xxv/xxv-1.4.ebuild b/www-misc/xxv/xxv-1.4.ebuild
new file mode 100644
index 000000000000..387bb66b743c
--- /dev/null
+++ b/www-misc/xxv/xxv-1.4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.4.ebuild,v 1.1 2009/08/16 18:27:55 hd_brummy Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
+HOMEPAGE="http://xxv.berlios.de/content/view/44/1/"
+SRC_URI="mirror://berlios/${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
+	perl-core/IO-Compress
+	dev-perl/Config-Tiny
+	dev-perl/Digest-HMAC
+	dev-perl/Encode-Detect
+	dev-perl/GD[png,gif]
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/Event
+	dev-perl/IO-Socket-INET6
+	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/TextToHTML
+	dev-perl/Template-Toolkit
+	dev-perl/SOAP-Lite
+	dev-perl/XML-RSS
+	themes? ( >=x11-themes/${PN}-skins-1.3 )"
+
+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/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 XXV Database is needed !!!"
+		echo
+		elog "\tcd ${SHAREDIR}/contrib"
+		echo
+		elog "\tIt is really importend to edit the create-database.sql"
+		elog "\tfor UTF-8 Support changes in 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 importend to"
+		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 ! has_version "www-misc/${PN}"; then
+		echo
+		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
+
+	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:\$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/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
+
+	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}"
+}