version bump

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

4 files changed, 305 insertions, 5 deletions

diff --git a/www-misc/xxv/ChangeLog b/www-misc/xxv/ChangeLog
index f571f969250f..22a239f12811 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.3 2009/04/12 09:31:46 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.4 2009/04/16 00:28:31 hd_brummy Exp $
+
+*xxv-1.3 (16 Apr 2009)
+
+  16 Apr 2009; Joerg Bornkessel <hd_brummy@gentoo.org> +files/xxv.utf8-v3,
+  +xxv-1.3.ebuild:
+  version bump
 
   12 Apr 2009; Joerg Bornkessel <hd_brummy@gentoo.org> xxv-1.0.1-r1.ebuild,
   xxv-1.2-r1.ebuild, xxv-1.2.1402.ebuild:
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index 2443cb24ff70..b47450832fbf 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -4,21 +4,24 @@ Hash: SHA1
 AUX xxv 1740 RMD160 0bf23d7ad41d16886ab634ce0f72525d01c62bbe SHA1 4810b59fa54eb5ce67be25f8c2320dbc93964afa SHA256 7ca0191b439184d0e0acfdc64fd3fe550b46f5ea4ed2437aa00463358061332f
 AUX xxv-1.0-logerror.patch 1477 RMD160 3795497ed97d16af9f7b10874619f567e723cc86 SHA1 712257f3d7a98da402f3c67bbd41b6bb132ff0a3 SHA256 ac8db7fb3d75be90dc33fdf427265dcd14355e572500140718fce2c731166822
 AUX xxv.utf8-v2 2080 RMD160 61b893d242635d00a6c2d079b57f7949d09a3e65 SHA1 06d77b27898d2d0e2dcbe121aa678bd9eb9df991 SHA256 c12eeef4f65971c8084b2d698ce276f94ca3b101f5c48d8f72189c1a2f96b73a
+AUX xxv.utf8-v3 2392 RMD160 8a14e2a3efd3cf5ae641d9910dca5c4ff002faff SHA1 2627a4a68e41fee353874a8a6e4d00a956a5a886 SHA256 a10bb1cfd40685fe815495e3b4cfafdb62951db3c50636ed5e9b884bf6da130e
 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
 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
+DIST xxv-1.3.tgz 961834 RMD160 2f54eb32c0b08c19fe6c8ab690f744fe62282787 SHA1 b04f2a823ccfb8755c4dde8345ad8b0002f1fc76 SHA256 a8ac13c242b99f4d5d42fb2a51ff48be8367af40ca38066386eb01c70eb1126a
 EBUILD xxv-1.0.1-r1.ebuild 4450 RMD160 d60d6d09aa27ab933451a6cd233558fed9a2b04f SHA1 3f99ba257dffd14e6624143e083278e65f655b57 SHA256 628b90b25b9d60dd81fc09f8437b9638a09557ca783ff91ef243dce3d88463e4
 EBUILD xxv-1.2-r1.ebuild 4391 RMD160 04925e02bcc476c4784267c40a54e36e4fa44040 SHA1 e767dd5f913d52ac352da46aff0f51df53b12c7c SHA256 8bcc642691695d6cb96992707451fe224d4d65e42b58614360b22ffd3b15b620
 EBUILD xxv-1.2.1402.ebuild 4400 RMD160 4a561a39e9c8cd0bd2367ac7bd6f948d1ba24499 SHA1 9620a9f896c231bf6c9f622aa13f4745946416e9 SHA256 8fcd5e7ed1b3a30ed7c1520089d2e9561b31201ff8690d4ae2070ccfcf69db5e
-MISC ChangeLog 3272 RMD160 b1f2c2cd873d47c72c3575424283eb0482ae7956 SHA1 a90654bcb8e73d8824a7276ef77e3d81eff4a0e0 SHA256 22a52bfe03cfb19f2e261b5295ab0b4eb2693185f2d87849259cf43d437864cc
+EBUILD xxv-1.3.ebuild 4318 RMD160 c5d8a754d9da39fcbb7d209ed2d4fb54027381c4 SHA1 2be85dfa6804a8db94d70dcd108de4659a2ca629 SHA256 c40f5d57b3c1c8927ab6ae463f91d86c51b2ba04648cbb2b2e77138d4952b671
+MISC ChangeLog 3406 RMD160 79ee5bec454849a10ce4179c96b060046a00e061 SHA1 24b2e35c7db442e5622b8c688427aee4be12af22 SHA256 868f9029e3ff342b9ecc227ae167b0e80d63143ba2b9f73525dcf621ed052db6
 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
 
-iD8DBQFJ4bUPdn07HTTCgIoRAmZdAJ98m1rEjkEagoreZqTT+yYEn+XJ3gCgmlX6
-Mg2fvHhVlGIOHsA6L+eai3o=
-=se63
+iD8DBQFJ5nu8dn07HTTCgIoRAmFiAJ92hKhjZaqPs+I14O7+M+DuYuzgWACfU30j
+CPJhVkovqbnSkyI2OBLc2/8=
+=6Xeg
 -----END PGP SIGNATURE-----
diff --git a/www-misc/xxv/files/xxv.utf8-v3 b/www-misc/xxv/files/xxv.utf8-v3
new file mode 100644
index 000000000000..cb8a3af74276
--- /dev/null
+++ b/www-misc/xxv/files/xxv.utf8-v3
@@ -0,0 +1,112 @@
+#!/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-v3,v 1.1 2009/04/16 00:28:31 hd_brummy Exp $
+
+RUNAS_USER="root"
+
+# Set Verbose Level 0 -> 5 
+VERBOSE="5"
+
+#set -xv
+
+# 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"
+
+depend() {
+	after vdr
+	after net
+}
+
+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
+		[ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ]
+		rm ${PIDFILE}
+		killall xxvd 2> /dev/null
+	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
+		[ -L /var/lib/init.d/started/xxv -a ! -e ${PIDFILE} ]
+		rm /var/lib/init.d/started/xxv
+		/etc/init.d/xxv zap
+		killall xxvd 2> /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"
+		printf "\txxv starting with utf-8 support\n" >> "${LOGFILE}"
+	fi
+}
+	
+start() {
+	check_vdradmin
+	xxv_logger	
+	set_utf8_charset
+
+	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} -- \
+	${XXV_UTF8} -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.3.ebuild b/www-misc/xxv/xxv-1.3.ebuild
new file mode 100644
index 000000000000..0422fa3b1cac
--- /dev/null
+++ b/www-misc/xxv/xxv-1.3.ebuild
@@ -0,0 +1,179 @@
+# 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.1 2009/04/16 00:28:31 hd_brummy Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
+HOMEPAGE="http://xxv.berlios.de/content/view/43/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
+	virtual/perl-Compress-Zlib
+	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
+	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/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 "cd ${SHAREDIR}/contrib"
+		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
+		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 ! 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_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/:" \
+		-e "s:\$RealBin/../share/xmltv:${SHAREDIR}/xmltv:"
+
+	sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl
+}
+
+src_install() {
+
+	newinitd "${FILESDIR}"/xxv.utf8-v3 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 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}"
+}