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

(Portage version: 2.1.6.7/cvs/Linux i686)

4 files changed, 33 insertions, 217 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/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/*