version bump; some eapi=2 fixes in older ebuilds

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 294 insertions, 9 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/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}"
+}