Cleaned up almost all old versions, but latest and latest that supports old vdradmin-autotimers.

(Portage version: 2.1.2.2)

12 files changed, 8 insertions, 716 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 844d9b852ff8..141d1357344a 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/vdradmin-am
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.16 2007/03/13 11:46:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.17 2007/03/13 11:57:27 zzam Exp $
+
+  13 Mar 2007; Matthias Schwarzott <zzam@gentoo.org> -files/vdradmin,
+  -vdradmin-am-3.4.6.ebuild, -vdradmin-am-3.4.7.ebuild,
+  -vdradmin-am-3.5.0.ebuild, -vdradmin-am-3.5.1.ebuild,
+  -vdradmin-am-3.5.2-r2.ebuild:
+  Cleaned up almost all old versions, but latest and latest that supports old
+  vdradmin-autotimers.
 
   13 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdradmin-am-3.5.3.ebuild:
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.6 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.6
deleted file mode 100644
index 1b043facf08b..000000000000
--- a/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 35a52178bf77730ef1cfed8aa6eeaf2e vdradmin-am-3.4.6.tar.bz2 508340
-RMD160 9a8039ebf5df52939720ec1d223937e60995c980 vdradmin-am-3.4.6.tar.bz2 508340
-SHA256 eeb9534f08a41ad3149446707417910e79ef76e958f4f216634557e9675d767a vdradmin-am-3.4.6.tar.bz2 508340
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.7 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.7
deleted file mode 100644
index 9e6e1aee7df2..000000000000
--- a/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3f862dfa078bdef05b52a841850c65a vdradmin-am-3.4.7.tar.bz2 506628
-RMD160 04413c1a767c668f0bb8d68dfe016fa449d06be6 vdradmin-am-3.4.7.tar.bz2 506628
-SHA256 46a07e9aed77d533a0e4045a733962db36beab025c7eb297eda0c0ec41d6f1c9 vdradmin-am-3.4.7.tar.bz2 506628
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.0 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.0
deleted file mode 100644
index d4774ffd271c..000000000000
--- a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 945102178caec3f0012dc3aaffcf1014 vdradmin-am-3.5.0.tar.bz2 506174
-RMD160 e2ec7300c83cd3749e275c2be3ef85286219c24f vdradmin-am-3.5.0.tar.bz2 506174
-SHA256 638007f7c160b857edcef5368b7888948ead2571a2bf8882e4dc054b99ca7ab8 vdradmin-am-3.5.0.tar.bz2 506174
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.1 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.1
deleted file mode 100644
index c7cc1c280f10..000000000000
--- a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95b993576f1e5634e13b6ab8380c1d8b vdradmin-am-3.5.1.tar.bz2 530000
-RMD160 54e7d858173646208dc87da7ae2455f6da181ffc vdradmin-am-3.5.1.tar.bz2 530000
-SHA256 55481c6adba273874291b721f1c5d539d5d0cd34ed26c9498dc73f8e80f281ea vdradmin-am-3.5.1.tar.bz2 530000
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r2 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r2
deleted file mode 100644
index 06034a01deed..000000000000
--- a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7307c78bf9bf57c9f17311380423e6f4 vdradmin-am-3.5.2.tar.bz2 529968
-RMD160 e1fdbc260f7b44eedda767dd8d383ea645321871 vdradmin-am-3.5.2.tar.bz2 529968
-SHA256 41aa6fcedb40bcc65c71660636871e09e3957892cf6ffd9a583969e680b8ca4e vdradmin-am-3.5.2.tar.bz2 529968
diff --git a/net-www/vdradmin-am/files/vdradmin b/net-www/vdradmin-am/files/vdradmin
deleted file mode 100644
index b13f61f3cf97..000000000000
--- a/net-www/vdradmin-am/files/vdradmin
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin,v 1.1 2006/07/14 15:16:36 hd_brummy Exp $
-
-depend() {
-	need vdr
-}
-
-start() {
-	ebegin "Starting vdradmind"
-	start-stop-daemon --start --background --exec /usr/bin/vdradmind.pl
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping vdradmind"
-	start-stop-daemon --stop --quiet --pidfile /var/run/vdradmind.pid
-	eend $?
-}
diff --git a/net-www/vdradmin-am/vdradmin-am-3.4.6.ebuild b/net-www/vdradmin-am/vdradmin-am-3.4.6.ebuild
deleted file mode 100644
index 25d5efc3be63..000000000000
--- a/net-www/vdradmin-am/vdradmin-am-3.4.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.4.6.ebuild,v 1.3 2007/01/06 14:53:38 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://andreas.vdr-developer.org/"
-SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=dev-perl/Compress-Zlib-1.2.2
-	media-video/vdr
-	dev-perl/Compress-Zlib
-	dev-perl/Locale-gettext
-	dev-perl/Authen-SASL
-	dev-perl/Digest-HMAC"
-
-ETCDIR="/etc/vdradmin"
-LIBDIR="/usr/share/vdradmin"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-}
-
-
-src_compile() {
-	einfo "no need to compile"
-}
-
-src_install() {
-
-	doinitd ${FILESDIR}/vdradmin
-
-	dobin vdradmind.pl
-
-	insinto ${LIBDIR}/template
-	doins -r ${S}/template/*
-
-	insinto ${LIBDIR}/lib
-	doins -r ${S}/lib/*
-
-	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
-
-	dodoc COPYING HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
-	docinto contrib
-	dodoc ${S}/contrib/*
-
-	keepdir /etc/vdradmin
-
-	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
-}
-
-pkg_postinst() {
-	elog
-	elog "run \"vdradmind.pl -c\" to setup ..."
-	elog "if this is a new install"
-	elog
-}
diff --git a/net-www/vdradmin-am/vdradmin-am-3.4.7.ebuild b/net-www/vdradmin-am/vdradmin-am-3.4.7.ebuild
deleted file mode 100644
index 77ae076aa3fa..000000000000
--- a/net-www/vdradmin-am/vdradmin-am-3.4.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.4.7.ebuild,v 1.4 2007/01/06 14:53:38 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://andreas.vdr-developer.org/"
-SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="unicode"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=dev-perl/Compress-Zlib-1.2.2
-	media-video/vdr
-	dev-perl/Compress-Zlib
-	dev-perl/Locale-gettext
-	dev-perl/Authen-SASL
-	dev-perl/Digest-HMAC
-	unicode? ( sys-devel/gettext )"
-
-ETCDIR="/etc/vdradmin"
-LIBDIR="/usr/share/vdradmin"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-}
-
-
-src_compile() {
-
-	if ! use unicode; then
-		einfo "no need to compile"
-	else
-		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
-	fi
-}
-
-src_install() {
-
-	doinitd ${FILESDIR}/vdradmin
-
-	dobin vdradmind.pl
-
-	insinto ${LIBDIR}/template
-	doins -r ${S}/template/*
-
-	insinto ${LIBDIR}/lib
-	doins -r ${S}/lib/*
-
-	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
-
-	dodoc COPYING HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
-	docinto contrib
-	dodoc ${S}/contrib/*
-
-	keepdir /etc/vdradmin
-
-	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
-}
-
-pkg_postinst() {
-	elog
-	elog "run \"vdradmind.pl -c\" to setup ..."
-	elog "if this is a new install"
-	elog
-}
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild
deleted file mode 100644
index 37652a7e17f1..000000000000
--- a/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild,v 1.3 2007/01/06 14:53:38 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://andreas.vdr-developer.org/"
-SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="unicode"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=dev-perl/Compress-Zlib-1.2.2
-	media-video/vdr
-	dev-perl/Compress-Zlib
-	dev-perl/Locale-gettext
-	dev-perl/Authen-SASL
-	dev-perl/Digest-HMAC
-	unicode? ( sys-devel/gettext )"
-
-ETC_DIR="/etc/vdradmin"
-LIB_DIR="/usr/share/vdradmin"
-VDRADMIN_USER="vdradmin"
-VDRADMIN_GROUP="vdradmin"
-TMP_DIR=/var/tmp/vdradmin
-
-pkg_setup() {
-	enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
-	sed -i vdradmind.pl \
-		-e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \
-		-e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-"
-}
-
-
-src_compile() {
-
-	if ! use unicode; then
-		einfo "no need to compile"
-	else
-		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
-	fi
-}
-
-src_install() {
-
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
-
-	dobin vdradmind.pl
-
-	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
-
-	insinto ${LIB_DIR}/lib
-	doins -r ${S}/lib/*
-
-	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
-
-	exeinto ${LIB_DIR}
-	doexe autotimer2searchtimer.pl
-
-	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
-	docinto contrib
-	dodoc ${S}/contrib/*
-
-	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
-	keepdir "${ETC_DIR}"
-	keepdir "${TMP_DIR}"
-
-	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
-}
-
-pkg_preinst() {
-	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
-	else
-		elog "Creating a new config-file."
-		echo
-
-		cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf
-			VDRCONFDIR = /etc/vdr
-			VIDEODIR = /var/vdr/video
-			EPG_FILENAME = /var/vdr/video/epg.data
-			EPGIMAGES = /var/vdr/video/epgimages
-			PASSWORD = gentoo-vdr
-			USERNAME = gentoo-vdr
-		EOF
-		# feed it with newlines
-		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
-		  |sed -e 's/: /: \n/g'
-
-		elog
-		elog "Created default user/password: gentoo-vdr/gentoo-vdr"
-		elog
-		elog "you can run \"emerge --config vdradmin-am\" if"
-		elog "the default-values for vdr does not match your"
-		elog "installation or change it in Setup-Menu of Web-Interface."
-		elog
-	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
-}
-
-pkg_postinst() {
-	if [[ -d ${ROOT}${ETC_DIR} ]]; then
-		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
-		if [[ ${owner} != vdradmin ]]; then
-			elog "Changing ownership of ${ETC_DIR}."
-			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
-		fi
-	fi
-
-	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
-		ewarn "You have a leftover directory of vdradmin."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
-		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
-	fi
-
-	local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf
-	local SOURCE=${ETC_DIR}/vdradmind.at
-	if [[ -s ${ROOT}${SOURCE} ]]; then
-		ewarn "If you used the autotimer of vdradmin,"
-		ewarn "it is a good idea to convert them now"
-		ewarn "to use with epgsearch."
-		ewarn
-		if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then
-			ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch"
-		fi
-
-		local SIZE=0
-
-		[[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l)
-
-		ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):"
-		local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}"
-		ewarn "# ${BASE_CMD} -s"
-
-		ewarn
-		ewarn "Else you can use this:"
-		if [[ ${SIZE} == 0 ]]; then
-			ewarn "# ${BASE_CMD} -o ${DEST}"
-		else
-			ewarn "You already have some timers defined!."
-			ewarn "# ${BASE_CMD} -o ${DEST}.new"
-			ewarn
-			ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own."
-			ewarn
-		fi
-		ewarn "# chown vdr:vdr ${DEST}"
-		ewarn
-		ewarn "If you are sure that epgsearch has got all your timer,"
-		ewarn "then you can delete vdradmin-autotimers."
-		ewarn "# rm ${SOURCE}"
-	fi
-}
-
-pkg_config() {
-	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
-}
-
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild
deleted file mode 100644
index 12e0003d6a84..000000000000
--- a/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild,v 1.3 2007/01/06 14:53:38 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://andreas.vdr-developer.org/"
-SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="unicode"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=dev-perl/Compress-Zlib-1.2.2
-	media-video/vdr
-	dev-perl/Compress-Zlib
-	dev-perl/Locale-gettext
-	dev-perl/Authen-SASL
-	dev-perl/Digest-HMAC
-	unicode? ( sys-devel/gettext )"
-
-ETC_DIR="/etc/vdradmin"
-LIB_DIR="/usr/share/vdradmin"
-VDRADMIN_USER="vdradmin"
-VDRADMIN_GROUP="vdradmin"
-TMP_DIR=/var/tmp/vdradmin
-
-pkg_setup() {
-	enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
-	sed -i vdradmind.pl \
-		-e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \
-		-e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-"
-}
-
-
-src_compile() {
-
-	if ! use unicode; then
-		einfo "no need to compile"
-	else
-		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
-	fi
-}
-
-src_install() {
-
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
-
-	dobin vdradmind.pl
-
-	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
-
-	insinto ${LIB_DIR}/lib
-	doins -r ${S}/lib/*
-
-	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
-
-	exeinto ${LIB_DIR}
-	doexe autotimer2searchtimer.pl
-
-	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
-	docinto contrib
-	dodoc ${S}/contrib/*
-
-	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
-	keepdir "${ETC_DIR}"
-	keepdir "${TMP_DIR}"
-
-	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
-}
-
-pkg_preinst() {
-	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
-	else
-		elog "Creating a new config-file."
-		echo
-
-		cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf
-			VDRCONFDIR = /etc/vdr
-			VIDEODIR = /var/vdr/video
-			EPG_FILENAME = /var/vdr/video/epg.data
-			EPGIMAGES = /var/vdr/video/epgimages
-			PASSWORD = gentoo-vdr
-			USERNAME = gentoo-vdr
-		EOF
-		# feed it with newlines
-		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
-		  |sed -e 's/: /: \n/g'
-
-		elog
-		elog "Created default user/password: gentoo-vdr/gentoo-vdr"
-		elog
-		elog "you can run \"emerge --config vdradmin-am\" if"
-		elog "the default-values for vdr does not match your"
-		elog "installation or change it in Setup-Menu of Web-Interface."
-		elog
-	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
-}
-
-pkg_postinst() {
-	if [[ -d ${ROOT}${ETC_DIR} ]]; then
-		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
-		if [[ ${owner} != vdradmin ]]; then
-			elog "Changing ownership of ${ETC_DIR}."
-			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
-		fi
-	fi
-
-	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
-		ewarn "You have a leftover directory of vdradmin."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
-		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
-	fi
-
-	local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf
-	local SOURCE=${ETC_DIR}/vdradmind.at
-	if [[ -s ${ROOT}${SOURCE} ]]; then
-		ewarn "If you used the autotimer of vdradmin,"
-		ewarn "it is a good idea to convert them now"
-		ewarn "to use with epgsearch."
-		ewarn
-		if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then
-			ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch"
-		fi
-
-		local SIZE=0
-
-		[[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l)
-
-		ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):"
-		local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}"
-		ewarn "# ${BASE_CMD} -s"
-
-		ewarn
-		ewarn "Else you can use this:"
-		if [[ ${SIZE} == 0 ]]; then
-			ewarn "# ${BASE_CMD} -o ${DEST}"
-		else
-			ewarn "You already have some timers defined!."
-			ewarn "# ${BASE_CMD} -o ${DEST}.new"
-			ewarn
-			ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own."
-			ewarn
-		fi
-		ewarn "# chown vdr:vdr ${DEST}"
-		ewarn
-		ewarn "If you are sure that epgsearch has got all your timer,"
-		ewarn "then you can delete vdradmin-autotimers."
-		ewarn "# rm ${SOURCE}"
-	fi
-}
-
-pkg_config() {
-	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
-}
-
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild
deleted file mode 100644
index 496203feba28..000000000000
--- a/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild,v 1.1 2007/01/21 13:22:17 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://andreas.vdr-developer.org/"
-SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="unicode"
-
-DEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=dev-perl/Compress-Zlib-1.2.2
-	media-video/vdr
-	dev-perl/Compress-Zlib
-	dev-perl/Locale-gettext
-	dev-perl/Authen-SASL
-	dev-perl/Digest-HMAC
-	dev-perl/URI
-	unicode? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-
-ETC_DIR="/etc/vdradmin"
-LIB_DIR="/usr/share/vdradmin"
-VDRADMIN_USER="vdradmin"
-VDRADMIN_GROUP="vdradmin"
-TMP_DIR=/var/tmp/vdradmin
-
-pkg_setup() {
-	enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR}
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
-	sed -i vdradmind.pl \
-		-e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \
-		-e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-"
-}
-
-
-src_compile() {
-
-	if ! use unicode; then
-		einfo "no need to compile"
-	else
-		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
-	fi
-}
-
-src_install() {
-
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
-
-	dobin vdradmind.pl
-
-	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
-
-	insinto ${LIB_DIR}/lib/Template/Plugin
-	doins -r ${S}/lib/Template/Plugin/JavaScript.pm
-
-	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
-
-	exeinto ${LIB_DIR}
-	doexe autotimer2searchtimer.pl
-
-	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
-	docinto contrib
-	dodoc ${S}/contrib/*
-
-	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
-	keepdir "${ETC_DIR}"
-	keepdir "${TMP_DIR}"
-
-	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
-}
-
-pkg_preinst() {
-	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
-	else
-		elog "Creating a new config-file."
-		echo
-
-		cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf
-			VDRCONFDIR = /etc/vdr
-			VIDEODIR = /var/vdr/video
-			EPG_FILENAME = /var/vdr/video/epg.data
-			EPGIMAGES = /var/vdr/video/epgimages
-			PASSWORD = gentoo-vdr
-			USERNAME = gentoo-vdr
-		EOF
-		# feed it with newlines
-		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
-		  |sed -e 's/: /: \n/g'
-
-		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
-
-		elog
-		elog "Created default user/password: gentoo-vdr/gentoo-vdr"
-		elog
-		elog "you can run \"emerge --config vdradmin-am\" if"
-		elog "the default-values for vdr does not match your"
-		elog "installation or change it in Setup-Menu of Web-Interface."
-		elog
-	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
-}
-
-pkg_postinst() {
-	if [[ -d ${ROOT}${ETC_DIR} ]]; then
-		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
-		if [[ ${owner} != vdradmin ]]; then
-			elog "Changing ownership of ${ETC_DIR}."
-			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
-		fi
-	fi
-
-	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
-		ewarn "You have a leftover directory of vdradmin."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
-		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
-	fi
-
-	local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf
-	local SOURCE=${ETC_DIR}/vdradmind.at
-	if [[ -s ${ROOT}${SOURCE} ]]; then
-		ewarn "If you used the autotimer of vdradmin,"
-		ewarn "it is a good idea to convert them now"
-		ewarn "to use with epgsearch."
-		ewarn
-		if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then
-			ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch"
-		fi
-
-		local SIZE=0
-
-		[[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l)
-
-		ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):"
-		local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}"
-		ewarn "# ${BASE_CMD} -s"
-
-		ewarn
-		ewarn "Else you can use this:"
-		if [[ ${SIZE} == 0 ]]; then
-			ewarn "# ${BASE_CMD} -o ${DEST}"
-		else
-			ewarn "You already have some timers defined!."
-			ewarn "# ${BASE_CMD} -o ${DEST}.new"
-			ewarn
-			ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own."
-			ewarn
-		fi
-		ewarn "# chown vdr:vdr ${DEST}"
-		ewarn
-		ewarn "If you are sure that epgsearch has got all your timer,"
-		ewarn "then you can delete vdradmin-autotimers."
-		ewarn "# rm ${SOURCE}"
-	fi
-}
-
-pkg_config() {
-	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
-}
-