cleanup old versions

(Portage version: 2.1.9.25/cvs/Linux i686)

13 files changed, 12 insertions, 1563 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 377c375c531e..f1603bc8b54a 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.109 2010/12/22 10:22:46 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.110 2011/01/23 23:10:33 hd_brummy Exp $
+
+  23 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -gentoo-vdr-scripts-0.4.0.ebuild, -gentoo-vdr-scripts-0.4.1.ebuild,
+  -gentoo-vdr-scripts-0.4.2.ebuild, -gentoo-vdr-scripts-0.4.3.ebuild,
+  -gentoo-vdr-scripts-0.4.3-r1.ebuild,
+  -files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff,
+  -gentoo-vdr-scripts-0.4.4.ebuild, -gentoo-vdr-scripts-0.4.5_rc1.ebuild,
+  -gentoo-vdr-scripts-0.4.5_rc2.ebuild, -gentoo-vdr-scripts-0.4.5.ebuild,
+  -gentoo-vdr-scripts-0.4.6.ebuild, -gentoo-vdr-scripts-0.4.6-r1.ebuild:
+  cleanup old versions
 
   22 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   gentoo-vdr-scripts-0.4.7.ebuild:
diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff
deleted file mode 100644
index 9ea6957bda53..000000000000
--- a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gentoo-vdr-scripts-0.4.3-orig/etc/init.d/wakeup-reboot-halt gentoo-vdr-scripts-0.4.3/etc/init.d/wakeup-reboot-halt
---- gentoo-vdr-scripts-0.4.3-orig/etc/init.d/wakeup-reboot-halt	2008-04-19 14:13:33.322545533 +0200
-+++ gentoo-vdr-scripts-0.4.3/etc/init.d/wakeup-reboot-halt	2008-04-19 14:13:56.422544885 +0200
-@@ -3,7 +3,7 @@
- # Distributed under the terms of the GNU General Public License v2
- # $Id: gentoo-vdr-scripts-0.4.3-fix-wakeup-reboot.diff,v 1.1 2008/04/19 12:23:23 zzam Exp $
- 
--extra_commands="mark_for_reboot"
-+opts="${opts} mark_for_reboot"
- 
- STATEFILE=/force_reboot_shutdown
- 
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild
deleted file mode 100644
index d22dd4f6da29..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.0.ebuild,v 1.5 2008/06/15 08:13:58 zmedico Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!<media-tv/vdr-dvd-scripts-0.0.2"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	local myopts=""
-	if use nvram ; then
-		myopts="${myopts} NVRAM=1"
-	fi
-
-	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	einfo "Smart updating /etc/conf.d/vdr.plugins"
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Using PLUGINS from /etc/conf.d/vdr"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.3.6"
-	previous_less_than_0_3_6=$?
-
-	has_version "<${CATEGORY}/${PN}-0.3.7"
-	previous_less_than_0_3_7=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_3_6 = 0 ]] ; then
-		ewarn
-		ewarn "A shutdown-file has been changed."
-		ewarn "You really have to execute"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		ewarn "to keep shutdown working."
-		ewarn
-
-		ebeep 5
-	else
-		elog
-		elog "To make shutdown work add this line to /etc/sudoers"
-		elog "\t${VDRSUDOENTRY}"
-		elog
-		elog "or execute this command:"
-		elog "\temerge --config gentoo-vdr-scripts"
-		elog
-	fi
-
-	if ! use nvram ; then
-		elog "nvram wakeup is now optional."
-		elog "To make use of it enable the use flag nvram for ${PN}"
-		elog "or just emerge nvram-wakeup."
-	fi
-
-	if [[ $previous_less_than_0_3_7 = 0 ]] ; then
-		einfo
-		einfo "Plugins which should be used are now set via its"
-		einfo "own config-file called /etc/conf.d/vdr.plugins"
-		einfo
-		einfo "Smart updating should have moved all your settings"
-		einfo
-	fi
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.1.ebuild
deleted file mode 100644
index 369eccff8d1e..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.1.ebuild,v 1.2 2008/06/15 08:13:58 zmedico Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	local myopts=""
-	if use nvram ; then
-		myopts="${myopts} NVRAM=1"
-	fi
-
-	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	einfo "Smart updating /etc/conf.d/vdr.plugins"
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Using PLUGINS from /etc/conf.d/vdr"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.3.6"
-	previous_less_than_0_3_6=$?
-
-	has_version "<${CATEGORY}/${PN}-0.3.7"
-	previous_less_than_0_3_7=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_3_6 = 0 ]] ; then
-		ewarn
-		ewarn "A shutdown-file has been changed."
-		ewarn "You really have to execute"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		ewarn "to keep shutdown working."
-		ewarn
-
-		ebeep 5
-	else
-		elog
-		elog "To make shutdown work add this line to /etc/sudoers"
-		elog "\t${VDRSUDOENTRY}"
-		elog
-		elog "or execute this command:"
-		elog "\temerge --config gentoo-vdr-scripts"
-		elog
-	fi
-
-	if ! use nvram ; then
-		elog "nvram wakeup is now optional."
-		elog "To make use of it enable the use flag nvram for ${PN}"
-		elog "or just emerge nvram-wakeup."
-	fi
-
-	if [[ $previous_less_than_0_3_7 = 0 ]] ; then
-		einfo
-		einfo "Plugins which should be used are now set via its"
-		einfo "own config-file called /etc/conf.d/vdr.plugins"
-		einfo
-		einfo "Smart updating should have moved all your settings"
-		einfo
-	fi
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild
deleted file mode 100644
index fe595dd44065..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.2.ebuild,v 1.3 2008/06/15 08:13:58 zmedico Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	local myopts=""
-	if use nvram ; then
-		myopts="${myopts} NVRAM=1"
-	fi
-
-	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	einfo "Smart updating /etc/conf.d/vdr.plugins"
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Using PLUGINS from /etc/conf.d/vdr"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.3.6"
-	previous_less_than_0_3_6=$?
-
-	has_version "<${CATEGORY}/${PN}-0.3.7"
-	previous_less_than_0_3_7=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_3_6 = 0 ]] ; then
-		ewarn
-		ewarn "A shutdown-file has been changed."
-		ewarn "You really have to execute"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		ewarn "to keep shutdown working."
-		ewarn
-
-		ebeep 5
-	else
-		elog
-		elog "To make shutdown work add this line to /etc/sudoers"
-		elog "\t${VDRSUDOENTRY}"
-		elog
-		elog "or execute this command:"
-		elog "\temerge --config gentoo-vdr-scripts"
-		elog
-	fi
-
-	if ! use nvram ; then
-		elog "nvram wakeup is now optional."
-		elog "To make use of it enable the use flag nvram for ${PN}"
-		elog "or just emerge nvram-wakeup."
-	fi
-
-	if [[ $previous_less_than_0_3_7 = 0 ]] ; then
-		einfo
-		einfo "Plugins which should be used are now set via its"
-		einfo "own config-file called /etc/conf.d/vdr.plugins"
-		einfo
-		einfo "Smart updating should have moved all your settings"
-		einfo
-	fi
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild
deleted file mode 100644
index d4661ecd859d..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3-r1.ebuild,v 1.3 2008/06/15 08:13:58 zmedico Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-wakeup-reboot.diff"
-}
-
-src_install() {
-	local myopts=""
-	if use nvram ; then
-		myopts="${myopts} NVRAM=1"
-	fi
-
-	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	einfo "Smart updating /etc/conf.d/vdr.plugins"
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Using PLUGINS from /etc/conf.d/vdr"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.3.6"
-	previous_less_than_0_3_6=$?
-
-	has_version "<${CATEGORY}/${PN}-0.3.7"
-	previous_less_than_0_3_7=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_3_6 = 0 ]] ; then
-		ewarn
-		ewarn "A shutdown-file has been changed."
-		ewarn "You really have to execute"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		ewarn "to keep shutdown working."
-		ewarn
-
-		ebeep 5
-	else
-		elog
-		elog "To make shutdown work add this line to /etc/sudoers"
-		elog "\t${VDRSUDOENTRY}"
-		elog
-		elog "or execute this command:"
-		elog "\temerge --config gentoo-vdr-scripts"
-		elog
-	fi
-
-	if ! use nvram ; then
-		elog "nvram wakeup is now optional."
-		elog "To make use of it enable the use flag nvram for ${PN}"
-		elog "or just emerge nvram-wakeup."
-	fi
-
-	if [[ $previous_less_than_0_3_7 = 0 ]] ; then
-		einfo
-		einfo "Plugins which should be used are now set via its"
-		einfo "own config-file called /etc/conf.d/vdr.plugins"
-		einfo
-		einfo "Smart updating should have moved all your settings"
-		einfo
-	fi
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3.ebuild
deleted file mode 100644
index 49bc5b8522c2..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.3.ebuild,v 1.3 2008/06/15 08:13:58 zmedico Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	local myopts=""
-	if use nvram ; then
-		myopts="${myopts} NVRAM=1"
-	fi
-
-	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	einfo "Smart updating /etc/conf.d/vdr.plugins"
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Using PLUGINS from /etc/conf.d/vdr"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.3.6"
-	previous_less_than_0_3_6=$?
-
-	has_version "<${CATEGORY}/${PN}-0.3.7"
-	previous_less_than_0_3_7=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_3_6 = 0 ]] ; then
-		ewarn
-		ewarn "A shutdown-file has been changed."
-		ewarn "You really have to execute"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		ewarn "to keep shutdown working."
-		ewarn
-
-		ebeep 5
-	else
-		elog
-		elog "To make shutdown work add this line to /etc/sudoers"
-		elog "\t${VDRSUDOENTRY}"
-		elog
-		elog "or execute this command:"
-		elog "\temerge --config gentoo-vdr-scripts"
-		elog
-	fi
-
-	if ! use nvram ; then
-		elog "nvram wakeup is now optional."
-		elog "To make use of it enable the use flag nvram for ${PN}"
-		elog "or just emerge nvram-wakeup."
-	fi
-
-	if [[ $previous_less_than_0_3_7 = 0 ]] ; then
-		einfo
-		einfo "Plugins which should be used are now set via its"
-		einfo "own config-file called /etc/conf.d/vdr.plugins"
-		einfo
-		einfo "Smart updating should have moved all your settings"
-		einfo
-	fi
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.4.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.4.ebuild
deleted file mode 100644
index 63dc6c18c323..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.4.ebuild,v 1.3 2008/06/15 08:13:58 zmedico Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	local myopts=""
-	if use nvram ; then
-		myopts="${myopts} NVRAM=1"
-	fi
-
-	emake -s install DESTDIR="${D}" ${myopts} || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	einfo "Smart updating /etc/conf.d/vdr.plugins"
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Using PLUGINS from /etc/conf.d/vdr"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.3.6"
-	previous_less_than_0_3_6=$?
-
-	has_version "<${CATEGORY}/${PN}-0.3.7"
-	previous_less_than_0_3_7=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_3_6 = 0 ]] ; then
-		ewarn
-		ewarn "A shutdown-file has been changed."
-		ewarn "You really have to execute"
-		ewarn "\temerge --config gentoo-vdr-scripts"
-		ewarn "to keep shutdown working."
-		ewarn
-
-		ebeep 5
-	else
-		elog
-		elog "To make shutdown work add this line to /etc/sudoers"
-		elog "\t${VDRSUDOENTRY}"
-		elog
-		elog "or execute this command:"
-		elog "\temerge --config gentoo-vdr-scripts"
-		elog
-	fi
-
-	if ! use nvram ; then
-		elog "nvram wakeup is now optional."
-		elog "To make use of it enable the use flag nvram for ${PN}"
-		elog "or just emerge nvram-wakeup."
-	fi
-
-	if [[ $previous_less_than_0_3_7 = 0 ]] ; then
-		einfo
-		einfo "Plugins which should be used are now set via its"
-		einfo "own config-file called /etc/conf.d/vdr.plugins"
-		einfo
-		einfo "Smart updating should have moved all your settings"
-		einfo
-	fi
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5.ebuild
deleted file mode 100644
index d970fefdd360..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5.ebuild,v 1.2 2008/11/11 12:37:14 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	elog
-	elog "To make shutdown work add this line to /etc/sudoers"
-	elog "\t${VDRSUDOENTRY}"
-	elog
-	elog "or execute this command:"
-	elog "\temerge --config gentoo-vdr-scripts"
-	elog
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild
deleted file mode 100644
index eb7779df756a..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc1.ebuild,v 1.1 2008/08/02 21:03:05 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	elog
-	elog "To make shutdown work add this line to /etc/sudoers"
-	elog "\t${VDRSUDOENTRY}"
-	elog
-	elog "or execute this command:"
-	elog "\temerge --config gentoo-vdr-scripts"
-	elog
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc2.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc2.ebuild
deleted file mode 100644
index 929b72772f9c..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.5_rc2.ebuild,v 1.1 2008/08/14 17:56:01 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	elog
-	elog "To make shutdown work add this line to /etc/sudoers"
-	elog "\t${VDRSUDOENTRY}"
-	elog
-	elog "or execute this command:"
-	elog "\temerge --config gentoo-vdr-scripts"
-	elog
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild
deleted file mode 100644
index 6aaf3c256110..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6-r1.ebuild,v 1.2 2010/01/11 20:21:37 zzam Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_prepare() {
-	# moved into own package
-	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
-	sed -e '/all:/s#compile##' -i Makefile
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	elog
-	elog "To make shutdown work add this line to /etc/sudoers"
-	elog "\t${VDRSUDOENTRY}"
-	elog
-	elog "or execute this command:"
-	elog "\temerge --config gentoo-vdr-scripts"
-	elog
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6.ebuild
deleted file mode 100644
index aaf00b26e619..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.4.6.ebuild,v 1.2 2009/03/03 11:19:42 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	!media-tv/vdr-dvd-scripts
-	!media-tv/vdrplugin-rebuild"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_install() {
-	emake -s install DESTDIR="${D}" || die "make install failed"
-	dodoc README TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images tmp; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	elog
-	elog "To make shutdown work add this line to /etc/sudoers"
-	elog "\t${VDRSUDOENTRY}"
-	elog
-	elog "or execute this command:"
-	elog "\temerge --config gentoo-vdr-scripts"
-	elog
-
-	elog "nvram wakeup is optional."
-	elog "To make use of it emerge sys-power/nvram-wakeup."
-	elog
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin."
-	elog
-
-	if [[ -f "${ROOT}/etc/init.d/dvbsplash" ]]; then
-		ewarn
-		ewarn "You have dvbsplash installed!"
-		ewarn "/etc/init.d/dvbsplash will now be deleted"
-		ewarn "as it causes difficult to debug problems."
-		ewarn
-		rm "${ROOT}/etc/init.d/dvbsplash"
-	fi
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-		einfo "sudoers-entry for vdr already in place."
-	else
-		einfo "Adding this line to /etc/sudoers:"
-		einfo "+  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			echo Commenting out old entry
-			sed -i \${1} -e '/\/usr\/lib\/vdr\/bin\/vdrshutdown-really.sh/s/^/#/'
-			echo Adding new entry
-			echo "" >> \${1}
-			echo "${VDRSUDOENTRY}" >> \${1}
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}