clean up

(Portage version: 2.1.6.13/cvs/Linux i686)

9 files changed, 36 insertions, 873 deletions

diff --git a/www-misc/xxv/ChangeLog b/www-misc/xxv/ChangeLog
index 4e6bd55b1b3d..276a509476b4 100644
--- a/www-misc/xxv/ChangeLog
+++ b/www-misc/xxv/ChangeLog
@@ -1,6 +1,17 @@
 # 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.9 2009/08/16 18:27:55 hd_brummy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/ChangeLog,v 1.10 2010/01/03 23:09:35 hd_brummy Exp $
+
+  03 Jan 2010; Joerg Bornkessel <hd_brummy@gentoo.org> -xxv-1.0.1-r1.ebuild,
+  -xxv-1.2-r1.ebuild, -xxv-1.2.1402.ebuild, -xxv-1.3.ebuild, xxv-1.4.ebuild,
+  +xxv-1.5.ebuild, -files/xxv, -files/xxv.utf8-v2, -files/xxv.utf8-v3:
+  clean up
+
+*xxv-1.5 (03 Jan 2010)
+
+  03 Jan 2010; Joerg Bornkessel <hd_brummy@gentoo.org> xxv-1.4.ebuild,
+  +xxv-1.5.ebuild, -files/xxv, -files/xxv.utf8-v2, -files/xxv.utf8-v3:
+  version bump; xxv-1.5 testing version; clean up
 
 *xxv-1.4 (16 Aug 2009)
 
diff --git a/www-misc/xxv/files/xxv b/www-misc/xxv/files/xxv
deleted file mode 100644
index 97560fd8ac1d..000000000000
--- a/www-misc/xxv/files/xxv
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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,v 1.1 2009/04/11 23:02:00 hd_brummy Exp $
-
-RUNAS_USER="vdr"
-
-# some fixed Path
-CONFIGFILE="/etc/xxv/xxvd.cfg"
-PIDFILE="/var/run/xxv/xxvd.pid"
-XXV_BIN="/usr/bin/xxvd"
-
-LANGUAGE="de_DE"
-
-# Set Verbose Level 0 -> 5 
-VERBOSE="3"
-
-#set -xv
-
-depend() {
-	need vdr
-	after net
-}
-
-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
-		fi
-}
-
-xxv_kill_pid() {
-
-		# After unclear stop, xxvd.pid will not removed, fixed with next line
-		if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] ; then
-			rm ${PIDFILE}
-			killall xxvd 2>&1 > /dev/null
-		fi
-}
-
-xxv_kill_initfile() {
-
-		# After unclear stop, init file in /var/lib/init.d/started/ still not removed
-		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>&1 > /dev/null
-		fi
-}
-	
-start() {
-
-	kill_vdradmin
-
-	# Finaly start XXV :)
-	export LANG="${LANGUAGE}"
-	ebegin "Start xxv"
-	start-stop-daemon  --nicelevel 15 --pidfile ${PIDFILE} --start -c ${RUNAS_USER} --exec ${XXV_BIN} -- \
-	-configfile=${CONFIGFILE} -verbose=${VERBOSE} -pidfile=${PIDFILE}
-	eend $?
-}
-
-
-stop() {
-
-	ebegin "Stopping xxv"
-	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/files/xxv.utf8-v2 b/www-misc/xxv/files/xxv.utf8-v2
deleted file mode 100644
index 890cd511e58a..000000000000
--- a/www-misc/xxv/files/xxv.utf8-v2
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/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-v2,v 1.1 2009/04/11 23:02:00 hd_brummy Exp $
-
-RUNAS_USER="vdr"
-
-# Set Verbose Level 0 -> 5 
-VERBOSE="1"
-
-#set -xv
-
-# some fixed Path
-CONFIGFILE="/etc/xxv/xxvd.cfg"
-PIDFILE="/var/run/xxv/xxvd.pid"
-XXV_BIN="/usr/bin/xxvd"
-
-
-depend() {
-	need vdr
-	after net
-}
-
-kill_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
-		logger -t xxv "vdradmin stopped by xxv initscript" 
-		logger -t xxv "xxv and vdradmin can not run on same port"
-	fi
-}
-
-xxv_kill_pid() {
-
-	# After unclear stop, xxvd.pid will not removed, fixed with next line
-	if [ -e ${PIDFILE} -a ! -L /var/lib/init.d/started/xxv ] ; then
-		rm ${PIDFILE}
-		killall xxvd 2>&1 > /dev/null
-	fi
-}
-
-xxv_kill_initfile() {
-
-	# After unclear stop, init file in /var/lib/init.d/started/ still not removed
-	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>&1 > /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"
-	fi
-}
-	
-start() {
-	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}
-	eend $?
-}
-
-
-stop() {
-
-	ebegin "Stopping xxvd"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-
-	xxv_kill_pid
-	xxv_kill_initfile
-#	killall xxvd 2>&1 > /dev/null
-
-	eend $?
-}
-
-restart() {
-
-	xxv_kill_pid
-	xxv_kill_initfile
-
-
-	svc_stop
-	svc_start
-}
diff --git a/www-misc/xxv/files/xxv.utf8-v3 b/www-misc/xxv/files/xxv.utf8-v3
deleted file mode 100644
index e56d4ee7df92..000000000000
--- a/www-misc/xxv/files/xxv.utf8-v3
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/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.2 2009/05/02 17:39:39 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
-		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
-
-}
-
-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.0.1-r1.ebuild b/www-misc/xxv/xxv-1.0.1-r1.ebuild
deleted file mode 100644
index 35d3e39ad0da..000000000000
--- a/www-misc/xxv/xxv-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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.0.1-r1.ebuild,v 1.3 2009/07/19 18:08:02 tove Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
-HOMEPAGE="http://xxv.berlios.de/content/view/37/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-IO-Compress
-	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/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="25"
-
-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 "www-misc/${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
-}
-
-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() {
-
-	doinitd "${FILESDIR}"/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,vtx}
-
-	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 COPYING LIESMICH NEWS README TODO TUTORIAL.txt.gz
-	fowners vdr:vdr /usr/share/doc/"${P}"
-
-	doman xxvd.1
-}
-
-pkg_postinst() {
-
-	if has_version "net-www/${PN}"; then
-		if has_version "=<net-www/${PN}-0.91_pre1002" ; then
-			echo
-			einfo "An update of XXV Database is needed"
-			echo
-			einfo "emerge --config ${PN}"
-			echo
-			einfo "will update your XXV Database"
-		fi
-	else
-		einfo "If this is a new install"
-		einfo "you have to create a empty DB for XXV"
-		echo
-		einfo "do this by:"
-		einfo "cd ${SHAREDIR}/contrib"
-		eerror "read the README"
-		einfo "edit create-database.sql and run"
-		einfo "emerge --config ${PN}"
-		echo
-		einfo "Set your own language in"
-		einfo "${SHAREDIR}/locale"
-		echo
-		einfo "For First Time Login in Browser use:"
-		einfo "Pass:Login = xxv:xxv"
-		echo
-		eerror "edit /etc/xxv/xxvd.cfg !"
-	fi
-}
-
-pkg_config() {
-
-	if has_version "=<net-www/${PN}-0.91_pre1002"; then
-		cd "${ROOT}"/"${SHAREDIR}"/contrib
-		./update-xxv
-	else
-		cd "${ROOT}"/"${SHAREDIR}"
-		cat ./contrib/create-database.sql | mysql -u root -p
-	fi
-}
-
-pkg_postrm() {
-
-	einfo "Cleanup for old "${P}" files"
-	rm -r /usr/share/doc/"${P}"
-}
diff --git a/www-misc/xxv/xxv-1.2-r1.ebuild b/www-misc/xxv/xxv-1.2-r1.ebuild
deleted file mode 100644
index cbe2d8cd21b0..000000000000
--- a/www-misc/xxv/xxv-1.2-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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-r1.ebuild,v 1.4 2009/07/19 18:08:02 tove Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)"
-HOMEPAGE="http://xxv.berlios.de/content/view/40/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-IO-Compress
-	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-${PV} )"
-
-PDEPEND="mplayer? ( media-video/mplayer )"
-
-SHAREDIR="/usr/share/${PN}"
-LIBDIR="/usr/lib/${PN}"
-
-DB_VERS="26"
-
-db_update_check() {
-
-	DB_VERS_OLD="`cat /var/db/pkg/www-misc/xxv-*/xxv-*.ebuild | grep DB_VERS | 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 "www-misc/${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() {
-
-	doinitd "${FILESDIR}"/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/www-misc/xxv/xxv-1.2.1402.ebuild b/www-misc/xxv/xxv-1.2.1402.ebuild
deleted file mode 100644
index 5732b42adb92..000000000000
--- a/www-misc/xxv/xxv-1.2.1402.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.5 2009/08/16 18:27:55 hd_brummy Exp $
-
-EAPI="2"
-
-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-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
-	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_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-v2 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}"
-}
diff --git a/www-misc/xxv/xxv-1.4.ebuild b/www-misc/xxv/xxv-1.4.ebuild
index 387bb66b743c..9e830d984bf3 100644
--- a/www-misc/xxv/xxv-1.4.ebuild
+++ b/www-misc/xxv/xxv-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.4.ebuild,v 1.2 2010/01/03 23:09:35 hd_brummy Exp $
 
 EAPI="2"
 
@@ -46,7 +46,7 @@ RDEPEND=">=media-video/vdr-1.2.6
 	dev-perl/Template-Toolkit
 	dev-perl/SOAP-Lite
 	dev-perl/XML-RSS
-	themes? ( >=x11-themes/${PN}-skins-1.3 )"
+	themes? ( >=x11-themes/${PN}-skins-${PV} )"
 
 PDEPEND="mplayer? ( media-video/mplayer )"
 
diff --git a/www-misc/xxv/xxv-1.3.ebuild b/www-misc/xxv/xxv-1.5.ebuild
index aa1d328cc309..a90e3cde9fb9 100644
--- a/www-misc/xxv/xxv-1.3.ebuild
+++ b/www-misc/xxv/xxv-1.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.3 2009/08/16 18:27:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/xxv/xxv-1.5.ebuild,v 1.1 2010/01/03 23:09:35 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/"
+HOMEPAGE="http://xxv.berlios.de/content/view/45/1/"
 SRC_URI="mirror://berlios/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
@@ -24,17 +24,18 @@ RDEPEND=">=media-video/vdr-1.2.6
 	virtual/perl-Getopt-Long
 	virtual/perl-MIME-Base64
 	virtual/perl-Time-HiRes
-	virtual/perl-IO-Compress
+	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/Digest-HMAC
+	dev-perl/Encode-Detect
 	dev-perl/Event
+	dev-perl/Font-TTF
+	dev-perl/GD[png,gif]
 	dev-perl/IO-Socket-INET6
-	dev-perl/JSON
+	dev-perl/JSON-XS
 	dev-perl/Linux-Inotify2
 	dev-perl/Locale-gettext
 	dev-perl/MP3-Info
@@ -42,9 +43,9 @@ RDEPEND=">=media-video/vdr-1.2.6
 	dev-perl/Net-Telnet
 	dev-perl/Net-XMPP
 	dev-perl/Proc-ProcessTable
+	dev-perl/SOAP-Lite
 	dev-perl/TextToHTML
 	dev-perl/Template-Toolkit
-	dev-perl/SOAP-Lite
 	dev-perl/XML-RSS
 	themes? ( >=x11-themes/${PN}-skins-${PV} )"
 
@@ -53,7 +54,7 @@ PDEPEND="mplayer? ( media-video/mplayer )"
 SHAREDIR="/usr/share/${PN}"
 LIBDIR="/usr/lib/${PN}"
 
-DB_VERS="31"
+DB_VERS="32"
 
 db_update_check() {
 
@@ -63,8 +64,12 @@ db_update_check() {
 		echo
 		elog "An update of XXV Database is needed !!!"
 		echo
-		elog "cd ${SHAREDIR}/contrib"
-		elog "run ./update-xxv -h for more info"
+		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
@@ -74,6 +79,7 @@ db_update_check() {
 		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
@@ -123,7 +129,7 @@ src_prepare() {
 
 src_install() {
 
-	newinitd "${FILESDIR}"/xxv.utf8-v3 xxv
+	newinitd "${FILESDIR}"/xxv.utf8-v5 xxv
 
 	dobin	bin/xxvd
 
@@ -158,7 +164,7 @@ src_install() {
 
 	cd "${S}"/doc
 	insinto /usr/share/doc/"${P}"
-	doins docu.tmpl CHANGELOG LIESMICH NEWS README TUTORIAL.txt.gz
+	doins docu.tmpl CHANGELOG README
 	fowners vdr:vdr /usr/share/doc/"${P}"
 
 	doman xxvd.1