cleanup

Package-Manager: portage-2.1.10.11/cvs/Linux i686
RepoMan-Options: --force

7 files changed, 10 insertions, 2230 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 9ed68e1341ed..855ea715ec13 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.149 2011/10/24 17:45:10 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.150 2011/11/12 13:22:02 hd_brummy Exp $
+
+  12 Nov 2011; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.6.0_p2.ebuild,
+  -vdr-1.6.0_p2-r2.ebuild, -vdr-1.6.0_p2-r3.ebuild, -vdr-1.6.0_p2-r4.ebuild,
+  -vdr-1.6.0_p2-r5.ebuild:
+  cleanup
 
   24 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
   keyworded ~arm
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index a876c1cf1ee0..310414eeb898 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -10,26 +10,19 @@ AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6
 AUX vdr-1.6.0-shared-tinyxml.diff 1215 RMD160 ee1133b6dcdaa1600c38ef0bbebb4a49b58778a2 SHA1 5341a0c998608df9fdc0fa6dfe84e14ed09183ea SHA256 3f23bb66125a1fc415c4d7312996d7382c89637eb9ebe3f0bc2b0cfc54de860f
 AUX vdr-1.6.0-use-v4l2.patch 7994 RMD160 a83561181024f202d6be2f42b5f1a6027d262107 SHA1 437bc0b62b2f78743411a41b9db8020b2bbf3632 SHA256 c4f5ec527c1ac8fa82a2a780251e040471a7056f1a784d817a9e8fc56280a852
 AUX vdr-dvb-api-5-is-fine.diff 392 RMD160 599009b4adedd9ef010b899b96744b29fa407ed7 SHA1 cf99f962034a5f7e5ba1cf06557e01e7d56bd281 SHA256 ba126c8233bae50f514aa713072027968d9e115e0d154e2e1d31fe1b8cbbb403
-DIST VDR-Extensions-Patch-64.tar.bz2 297099 RMD160 676f26baa04f56801508dabcff59899fb2a68d73 SHA1 f60fe2c075dda3241ad631b9f323f60954073a7a SHA256 3ecf0cd58276b02a37938fa0f40874e20f106621f66a289a20f36f36b88c4ee6
-DIST VDR-Extensions-Patch-68.tar.bz2 404176 RMD160 72ae121ba96bf8139d43b47738c956c785ce692c SHA1 a5daebe7cabb56e8870cbf3f6d4a2e1285a93724 SHA256 598d814af0efb0d681e9c904ffdfae61f195ba4cd2a27d83838f90ff4611b2ca
 DIST VDR-Extensions-Patch-72.tar.bz2 445171 RMD160 7a7e3b37810878138af50b6debf6bb14ad746327 SHA1 32075286c7d53060183a931f5ac52fbdb5cdff36 SHA256 defad883a4f42ebc257c14e1a71ec559db2d4d1d2d37eeee04abca542efbcf8d
 DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1 68a4a9aab1e5179b5d9725481e09bc1213d1aff2 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416a3c80f76b6a5b209eb
 DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
-EBUILD vdr-1.6.0_p2-r2.ebuild 11529 RMD160 7a8642a0ce3cc7239468b642666a385cda59b3be SHA1 58854b350f78ba09f7e00c2c3f762a921fdb60ae SHA256 1536cd01c08554e8837b5a7f0787bd0ec46eb9c003fd5a86be17a39dec9c3650
-EBUILD vdr-1.6.0_p2-r3.ebuild 11589 RMD160 b984dcc82a9230a8db9798f3472c82fc2d07848b SHA1 6456d231d0e6b85393ee2e725830ae05ec60b79b SHA256 8178955154ca1ba477e4313bad9193decb61991326e91aae15a543fc8f7b7034
-EBUILD vdr-1.6.0_p2-r4.ebuild 11489 RMD160 d3e873d9a78cbe5c139b3d579289e5da87ea7f80 SHA1 2f49062ab04f5ad61d7502580a60d4c10568cffd SHA256 5687b4b435a92c24da23eb3a6071c4a5c2925a8099b4069847ead65f8b974b4f
-EBUILD vdr-1.6.0_p2-r5.ebuild 11533 RMD160 375b330b2febe4be611b30c48dc63c053c869eae SHA1 3df8ae94097540072f9afc0f87fff7d14d599f0d SHA256 dd5c2b68184bfadc4c765f184befb459b6b372633506a16aa96d5eadd302940a
 EBUILD vdr-1.6.0_p2-r6.ebuild 11587 RMD160 af6a47b41608480b5f59fc480100ec5b415da17a SHA1 4d8e8f090d391720b488dcd3b32ad0761880fbef SHA256 9577faef99c55cd9f67d69b81888a40fb612b5c8f877258c8b9c0702ea6ee30d
 EBUILD vdr-1.6.0_p2-r7.ebuild 11631 RMD160 1d03b387cd5216052c317485cedea5968412ff38 SHA1 f6b41fe087c278b69088174f9144650f59e29d3c SHA256 f1647a2bb8be0a06e8c73ed4ea24dfacec45e9d57694a844ed9ff5be678073cd
-EBUILD vdr-1.6.0_p2.ebuild 10883 RMD160 97d045e28872e908fb47a93e6edb9ec20d81e01d SHA1 cc2fa6ea1ad1b4ec898604368af7867d9ac429fb SHA256 9ba3758cf693825c70b3268d7b92ce1773f7bd34780d2528b954e6c00e33475f
-MISC ChangeLog 27095 RMD160 5dad5f5bf19fa3136dfcfe103ecbff704e62a651 SHA1 bf9b77c2623a9fd8b625f0ddf42e6887525e9f2c SHA256 9ea545eb405470940309fedc099fce34d2aa9251ea5a811917e823cfd8ae2a38
+MISC ChangeLog 27287 RMD160 d150a81afe4635787cffc4af7d3a8a926d725f56 SHA1 cb257fa558e5dd8df663316ecea279c010293c01 SHA256 b953bbfa240a6bc6826e6194551a2474885fb5967786c6e943f65049fc36faea
 MISC metadata.xml 4220 RMD160 81bf8cd288b74bbfc0522b754100045980db7095 SHA1 0d73555d38505f5be3d6e0dcfbe7f706483e35d8 SHA256 d04d296b5a155a2d05e1ec5d6681c6d91fcb430f557e9a2416045090a39c8cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFOpaREdn07HTTCgIoRAsu0AJ9m0DVk7uUbPWVjpodYwJsblowRXQCfRz0w
-JiKZleLZQdFafK4/p+QV/aQ=
-=OlG3
+iD8DBQFOvnNfdn07HTTCgIoRAoHUAJ4jnId01W0p06sJCQ/36cmnvk+I7wCdGde7
+7sNRLVRMgkeNthUTphD7W7M=
+=nV9H
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.6.0_p2-r2.ebuild b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
deleted file mode 100644
index 15a0315377a8..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r2.ebuild,v 1.9 2011/02/26 18:56:20 signals Exp $
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n softosd"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
-
-IUSE="vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="68"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	check_menu_flags
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-check_menu_flags() {
-	if use menuorg && use setup; then
-		echo
-		eerror "Please use only one of this USE-Flags"
-		eerror "\tmenuorg setup"
-		die "multiple menu manipulation"
-	fi
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-extensions_all_defines_unset() {
-	# extract all possible settings for extensions-patch
-	# and convert them to -U... for unifdef
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
-		Make.config.template \
-		| tr '\n' ' '
-}
-
-do_unifdef() {
-	ebegin "Unifdef sources"
-	local mf="Makefile.get"
-	cat <<'EOT' > $mf
-include Makefile
-show_def:
-	@echo $(DEFINES)
-show_src_files:
-	@echo $(OBJS:%.o=%.c)
-EOT
-
-	local DEFINES=$(extensions_all_defines_unset)
-
-	local RAW_DEFINES=$(make -f "$mf" show_def)
-	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
-	local KEEP_FILES=""
-	rm "$mf"
-
-	local def
-	for def in $RAW_DEFINES; do
-		case "${def}" in
-			-DUSE*)
-				DEFINES="${DEFINES} ${def}"
-				;;
-		esac
-	done
-
-	local f
-	for f in *.c; do
-
-		# Removing the src files the Makefile does not use for compiling vdr
-		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
-			rm -f ${f} ${f%.c}.h
-			continue
-		fi
-
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-	done
-	for f in *.h; do
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-		[[ -s $f ]] || rm "$f"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/vdr/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	if use dxr3; then
-		einfo "Applying dxr3 subtitle hack"
-		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
-	fi
-
-	sed -i i18n-to-gettext.pl \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if use vanilla; then
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-	else
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
-		sed -e "s:dvdread:dvdnav:g" -i "${fname}"
-
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-extensions-gcc-4.4.diff
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="channelscan pluginapi pluginmissing"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-		use iptv && enable_patch pluginparam
-		use liemikuutio && enable_patch liemiext
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		local dir_tmp_var
-		local LOCALPATCHES_SUBDIR=${PV}
-		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
-			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
-				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
-			fi
-		done
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
-		fi
-
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
-	previous_less_than_1_3_36_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-1.6.0"
-	previous_less_than_1_6_0=$?
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "If you had used the use-flags lirc, rcu or vfat"
-		ewarn "then, you now have to enable the associated functionality"
-		ewarn "in /etc/conf.d/vdr"
-		ewarn
-		ewarn "vfat is now set with VFAT_FILENAMES."
-		ewarn "lirc/rcu are now set with IR_CTRL."
-		ebeep
-	fi
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	if use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	fi
-
-	if [[ $previous_less_than_1_6_0 = 0 ]]; then
-		elog "By default vdr is now started with utf8 character encoding"
-		elog
-		elog "To rename the old recordings to utf8 conforming names, do this:"
-		elog "\temerge app-text/convmv"
-		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
-		elog
-		elog "To fix the descriptions of your recordings do this:"
-		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
deleted file mode 100644
index 10cf7112a335..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r3.ebuild,v 1.8 2011/02/26 18:56:20 signals Exp $
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n softosd parentalrating"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
-
-IUSE="vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="72"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	check_menu_flags
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-check_menu_flags() {
-	if use menuorg && use setup; then
-		echo
-		eerror "Please use only one of this USE-Flags"
-		eerror "\tmenuorg setup"
-		die "multiple menu manipulation"
-	fi
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-extensions_all_defines_unset() {
-	# extract all possible settings for extensions-patch
-	# and convert them to -U... for unifdef
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
-		Make.config.template \
-		| tr '\n' ' '
-}
-
-do_unifdef() {
-	ebegin "Unifdef sources"
-	local mf="Makefile.get"
-	cat <<'EOT' > $mf
-include Makefile
-show_def:
-	@echo $(DEFINES)
-show_src_files:
-	@echo $(OBJS:%.o=%.c)
-EOT
-
-	local DEFINES=$(extensions_all_defines_unset)
-
-	local RAW_DEFINES=$(make -f "$mf" show_def)
-	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
-	local KEEP_FILES=""
-	rm "$mf"
-
-	local def
-	for def in $RAW_DEFINES; do
-		case "${def}" in
-			-DUSE*)
-				DEFINES="${DEFINES} ${def}"
-				;;
-		esac
-	done
-
-	local f
-	for f in *.c; do
-
-		# Removing the src files the Makefile does not use for compiling vdr
-		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
-			rm -f ${f} ${f%.c}.h
-			continue
-		fi
-
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-	done
-	for f in *.h; do
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-		[[ -s $f ]] || rm "$f"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/vdr/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	if use dxr3; then
-		einfo "Applying dxr3 subtitle hack"
-		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
-	fi
-
-	sed -i i18n-to-gettext.pl \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if use vanilla; then
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-	else
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
-		sed -e "s:dvdread:dvdnav:g" -i "${fname}"
-
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="channelscan pluginapi pluginmissing streamdevext"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use iptv && enable_patch pluginparam
-		use liemikuutio && enable_patch liemiext
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		local dir_tmp_var
-		local LOCALPATCHES_SUBDIR=${PV}
-		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
-			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
-				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
-			fi
-		done
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
-		fi
-
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
-	previous_less_than_1_3_36_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-1.6.0"
-	previous_less_than_1_6_0=$?
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "If you had used the use-flags lirc, rcu or vfat"
-		ewarn "then, you now have to enable the associated functionality"
-		ewarn "in /etc/conf.d/vdr"
-		ewarn
-		ewarn "vfat is now set with VFAT_FILENAMES."
-		ewarn "lirc/rcu are now set with IR_CTRL."
-		ebeep
-	fi
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	if use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	fi
-
-	if [[ $previous_less_than_1_6_0 = 0 ]]; then
-		elog "By default vdr is now started with utf8 character encoding"
-		elog
-		elog "To rename the old recordings to utf8 conforming names, do this:"
-		elog "\temerge app-text/convmv"
-		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
-		elog
-		elog "To fix the descriptions of your recordings do this:"
-		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.6.0_p2-r4.ebuild b/media-video/vdr/vdr-1.6.0_p2-r4.ebuild
deleted file mode 100644
index 19f2399225a6..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r4.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r4.ebuild,v 1.2 2011/02/26 18:56:20 signals Exp $
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n softosd parentalrating"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
-
-IUSE="vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="72"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	check_menu_flags
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-check_menu_flags() {
-	if use menuorg && use setup; then
-		echo
-		eerror "Please use only one of this USE-Flags"
-		eerror "\tmenuorg setup"
-		die "multiple menu manipulation"
-	fi
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-extensions_all_defines_unset() {
-	# extract all possible settings for extensions-patch
-	# and convert them to -U... for unifdef
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
-		Make.config.template \
-		| tr '\n' ' '
-}
-
-do_unifdef() {
-	ebegin "Unifdef sources"
-	local mf="Makefile.get"
-	cat <<'EOT' > $mf
-include Makefile
-show_def:
-	@echo $(DEFINES)
-show_src_files:
-	@echo $(OBJS:%.o=%.c)
-EOT
-
-	local DEFINES=$(extensions_all_defines_unset)
-
-	local RAW_DEFINES=$(make -f "$mf" show_def)
-	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
-	local KEEP_FILES=""
-	rm "$mf"
-
-	local def
-	for def in $RAW_DEFINES; do
-		case "${def}" in
-			-DUSE*)
-				DEFINES="${DEFINES} ${def}"
-				;;
-		esac
-	done
-
-	local f
-	for f in *.c; do
-
-		# Removing the src files the Makefile does not use for compiling vdr
-		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
-			rm -f ${f} ${f%.c}.h
-			continue
-		fi
-
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-	done
-	for f in *.h; do
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-		[[ -s $f ]] || rm "$f"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/vdr/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	if use dxr3; then
-		einfo "Applying dxr3 subtitle hack"
-		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
-	fi
-
-	sed -i i18n-to-gettext.pl \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if use vanilla; then
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-	else
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="channelscan pluginapi pluginmissing streamdevext"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use iptv && enable_patch pluginparam
-		use liemikuutio && enable_patch liemiext
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		local dir_tmp_var
-		local LOCALPATCHES_SUBDIR=${PV}
-		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
-			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
-				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
-			fi
-		done
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
-		fi
-
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
-	previous_less_than_1_3_36_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-1.6.0"
-	previous_less_than_1_6_0=$?
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "If you had used the use-flags lirc, rcu or vfat"
-		ewarn "then, you now have to enable the associated functionality"
-		ewarn "in /etc/conf.d/vdr"
-		ewarn
-		ewarn "vfat is now set with VFAT_FILENAMES."
-		ewarn "lirc/rcu are now set with IR_CTRL."
-		ebeep
-	fi
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	if use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	fi
-
-	if [[ $previous_less_than_1_6_0 = 0 ]]; then
-		elog "By default vdr is now started with utf8 character encoding"
-		elog
-		elog "To rename the old recordings to utf8 conforming names, do this:"
-		elog "\temerge app-text/convmv"
-		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
-		elog
-		elog "To fix the descriptions of your recordings do this:"
-		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.6.0_p2-r5.ebuild b/media-video/vdr/vdr-1.6.0_p2-r5.ebuild
deleted file mode 100644
index 82262c2009d8..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r5.ebuild
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r5.ebuild,v 1.4 2011/02/26 18:56:20 signals Exp $
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n softosd parentalrating"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
-
-IUSE="vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="72"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	check_menu_flags
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-check_menu_flags() {
-	if use menuorg && use setup; then
-		echo
-		eerror "Please use only one of this USE-Flags"
-		eerror "\tmenuorg setup"
-		die "multiple menu manipulation"
-	fi
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-extensions_all_defines_unset() {
-	# extract all possible settings for extensions-patch
-	# and convert them to -U... for unifdef
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
-		Make.config.template \
-		| tr '\n' ' '
-}
-
-do_unifdef() {
-	ebegin "Unifdef sources"
-	local mf="Makefile.get"
-	cat <<'EOT' > $mf
-include Makefile
-show_def:
-	@echo $(DEFINES)
-show_src_files:
-	@echo $(OBJS:%.o=%.c)
-EOT
-
-	local DEFINES=$(extensions_all_defines_unset)
-
-	local RAW_DEFINES=$(make -f "$mf" show_def)
-	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
-	local KEEP_FILES=""
-	rm "$mf"
-
-	local def
-	for def in $RAW_DEFINES; do
-		case "${def}" in
-			-DUSE*)
-				DEFINES="${DEFINES} ${def}"
-				;;
-		esac
-	done
-
-	local f
-	for f in *.c; do
-
-		# Removing the src files the Makefile does not use for compiling vdr
-		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
-			rm -f ${f} ${f%.c}.h
-			continue
-		fi
-
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-	done
-	for f in *.h; do
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-		[[ -s $f ]] || rm "$f"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-	epatch "${FILESDIR}"/vdr-1.6.0-ldflags.patch
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/vdr/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	if use dxr3; then
-		einfo "Applying dxr3 subtitle hack"
-		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
-	fi
-
-	sed -i i18n-to-gettext.pl \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if use vanilla; then
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-	else
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="channelscan pluginapi pluginmissing streamdevext"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use iptv && enable_patch pluginparam
-		use liemikuutio && enable_patch liemiext
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		local dir_tmp_var
-		local LOCALPATCHES_SUBDIR=${PV}
-		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
-			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
-				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
-			fi
-		done
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
-		fi
-
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
-	previous_less_than_1_3_36_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-1.6.0"
-	previous_less_than_1_6_0=$?
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "If you had used the use-flags lirc, rcu or vfat"
-		ewarn "then, you now have to enable the associated functionality"
-		ewarn "in /etc/conf.d/vdr"
-		ewarn
-		ewarn "vfat is now set with VFAT_FILENAMES."
-		ewarn "lirc/rcu are now set with IR_CTRL."
-		ebeep
-	fi
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	if use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	fi
-
-	if [[ $previous_less_than_1_6_0 = 0 ]]; then
-		elog "By default vdr is now started with utf8 character encoding"
-		elog
-		elog "To rename the old recordings to utf8 conforming names, do this:"
-		elog "\temerge app-text/convmv"
-		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
-		elog
-		elog "To fix the descriptions of your recordings do this:"
-		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.6.0_p2.ebuild b/media-video/vdr/vdr-1.6.0_p2.ebuild
deleted file mode 100644
index 7596039a7d67..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.11 2011/02/26 18:56:20 signals Exp $
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter iptv
-	jumpplay liemikuutio lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n"
-
-IUSE="vanilla dxr3 ${EXT_PATCH_FLAGS}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="64"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	check_menu_flags
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-check_menu_flags() {
-	if use menuorg && use setup; then
-		echo
-		eerror "Please use only one of this USE-Flags"
-		eerror "\tmenuorg setup"
-		die "multiple menu manipulation"
-	fi
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-extensions_all_defines_unset() {
-	# extract all possible settings for extensions-patch
-	# and convert them to -U... for unifdef
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
-		Make.config.template \
-		| tr '\n' ' '
-}
-
-do_unifdef() {
-	ebegin "Unifdef sources"
-	local mf="Makefile.get"
-	cat <<'EOT' > $mf
-include Makefile
-show_def:
-	@echo $(DEFINES)
-show_src_files:
-	@echo $(OBJS:%.o=%.c)
-EOT
-
-	local DEFINES=$(extensions_all_defines_unset)
-
-	local RAW_DEFINES=$(make -f "$mf" show_def)
-	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
-	local KEEP_FILES=""
-	rm "$mf"
-
-	local def
-	for def in $RAW_DEFINES; do
-		case "${def}" in
-			-DUSE*)
-				DEFINES="${DEFINES} ${def}"
-				;;
-		esac
-	done
-
-	local f
-	for f in *.c; do
-
-		# Removing the src files the Makefile does not use for compiling vdr
-		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
-			rm -f ${f} ${f%.c}.h
-			continue
-		fi
-
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-	done
-	for f in *.h; do
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-		[[ -s $f ]] || rm "$f"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/vdr/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	if use dxr3; then
-		einfo "Applying dxr3 subtitle hack"
-		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
-	fi
-
-	sed -i i18n-to-gettext.pl \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="channelscan pluginapi pluginmissing"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		local dir_tmp_var
-		local LOCALPATCHES_SUBDIR=${PV}
-		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
-			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
-				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
-			fi
-		done
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
-		fi
-
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
-	previous_less_than_1_3_36_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-1.6.0"
-	previous_less_than_1_6_0=$?
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "If you had used the use-flags lirc, rcu or vfat"
-		ewarn "then, you now have to enable the associated functionality"
-		ewarn "in /etc/conf.d/vdr"
-		ewarn
-		ewarn "vfat is now set with VFAT_FILENAMES."
-		ewarn "lirc/rcu are now set with IR_CTRL."
-		ebeep
-	fi
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	if use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	fi
-
-	if [[ $previous_less_than_1_6_0 = 0 ]]; then
-		elog "By default vdr is now started with utf8 character encoding"
-		elog
-		elog "To rename the old recordings to utf8 conforming names, do this:"
-		elog "\temerge app-text/convmv"
-		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
-		elog
-		elog "To fix the descriptions of your recordings do this:"
-		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}