Removed the old vdr-1.4 ebuilds.

(Portage version: 2.2_rc88/cvs/Linux x86_64)

11 files changed, 9 insertions, 1603 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 4234b79cdea8..b5baf1063b6d 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.137 2010/09/08 16:16:47 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.138 2010/10/05 13:12:43 zzam Exp $
+
+  05 Oct 2010; Matthias Schwarzott <zzam@gentoo.org>
+  -files/vdr-add-svdrp-down-0.1.diff, -vdr-1.4.6.ebuild,
+  -vdr-1.4.7-r10.ebuild, -vdr-1.4.7-r11.ebuild, -vdr-1.4.7-r12.ebuild,
+  -files/vdr-1.4.7-gcc-4.3.diff, -files/vdr-1.4.7-makefile-destdir.diff,
+  -files/vdr-1.4.7-makefile-install-header.diff,
+  -files/vdr-set-dumpable.diff, metadata.xml:
+  Removed the old vdr-1.4 ebuilds.
 
 *vdr-1.6.0_p2-r4 (08 Sep 2010)
 
diff --git a/media-video/vdr/files/vdr-1.4.7-gcc-4.3.diff b/media-video/vdr/files/vdr-1.4.7-gcc-4.3.diff
deleted file mode 100644
index 344ef0628246..000000000000
--- a/media-video/vdr/files/vdr-1.4.7-gcc-4.3.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up vdr-1.4.7/epg.c~ vdr-1.4.7/epg.c
---- vdr-1.4.7/epg.c~	2006-10-28 12:12:42.000000000 +0300
-+++ vdr-1.4.7/epg.c	2008-02-14 19:12:26.000000000 +0200
-@@ -12,6 +12,7 @@
- 
- #include "epg.h"
- #include <ctype.h>
-+#include <limits.h>
- #include <time.h>
- #include "libsi/si.h"
- #include "timers.h"
-diff -up vdr-1.4.7/menuitems.h~ vdr-1.4.7/menuitems.h
---- vdr-1.4.7/menuitems.h~	2008-02-14 19:10:06.000000000 +0200
-+++ vdr-1.4.7/menuitems.h	2008-02-14 19:12:39.000000000 +0200
-@@ -10,6 +10,7 @@
- #ifndef __MENUITEMS_H
- #define __MENUITEMS_H
- 
-+#include <limits.h>
- #include "osdbase.h"
- 
- extern const char *FileNameChars;
diff --git a/media-video/vdr/files/vdr-1.4.7-makefile-destdir.diff b/media-video/vdr/files/vdr-1.4.7-makefile-destdir.diff
deleted file mode 100644
index c01a18967cb1..000000000000
--- a/media-video/vdr/files/vdr-1.4.7-makefile-destdir.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: vdr-1.4.7/Makefile
-===================================================================
---- vdr-1.4.7.orig/Makefile
-+++ vdr-1.4.7/Makefile
-@@ -24,6 +24,7 @@ PLUGINDIR= ./PLUGINS
- PLUGINLIBDIR= $(PLUGINDIR)/lib
- 
- VIDEODIR = /video
-+CONFDIR  = $(VIDEODIR)
- 
- DOXYGEN  = /usr/bin/doxygen
- DOXYFILE = Doxyfile
-@@ -200,30 +201,31 @@ install: install-bin install-conf instal
- # VDR binary:
- 
- install-bin: vdr
--	@mkdir -p $(BINDIR)
--	@cp --remove-destination vdr runvdr $(BINDIR)
-+	@mkdir -p $(DESTDIR)$(BINDIR)
-+	@cp --remove-destination vdr runvdr svdrpsend.pl $(DESTDIR)$(BINDIR)
- 
- # Configuration files:
- 
- install-conf:
--	@if [ ! -d $(VIDEODIR) ]; then\
--	    mkdir -p $(VIDEODIR);\
--	    cp *.conf $(VIDEODIR);\
-+	@mkdir -p $(DESTDIR)$(VIDEODIR)
-+	@if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\
-+	    mkdir -p $(DESTDIR)$(CONFDIR);\
-+	    cp *.conf $(DESTDIR)$(CONFDIR);\
- 	    fi
- 
- # Documentation:
- 
- install-doc:
--	@mkdir -p $(MANDIR)/man1
--	@mkdir -p $(MANDIR)/man5
--	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
--	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
-+	@mkdir -p $(DESTDIR)$(MANDIR)/man1
-+	@mkdir -p $(DESTDIR)$(MANDIR)/man5
-+	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
-+	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
- 
- # Plugins:
- 
- install-plugins: plugins
--	@mkdir -p $(PLUGINLIBDIR)
--	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(PLUGINLIBDIR)
-+	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
-+	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
- 
- # Source documentation:
- 
diff --git a/media-video/vdr/files/vdr-1.4.7-makefile-install-header.diff b/media-video/vdr/files/vdr-1.4.7-makefile-install-header.diff
deleted file mode 100644
index 9f6e8eb42bc5..000000000000
--- a/media-video/vdr/files/vdr-1.4.7-makefile-install-header.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: vdr-1.4.7/Makefile
-===================================================================
---- vdr-1.4.7.orig/Makefile
-+++ vdr-1.4.7/Makefile
-@@ -19,6 +19,7 @@ MANDIR   = /usr/local/man
- BINDIR   = /usr/local/bin
- LIBS     = -ljpeg -lpthread -ldl -lcap
- INCLUDES =
-+HEADERDIR = /usr/local/include
- 
- PLUGINDIR= ./PLUGINS
- PLUGINLIBDIR= $(PLUGINDIR)/lib
-@@ -196,7 +197,7 @@ clean-plugins:
- 
- # Install the files:
- 
--install: install-bin install-conf install-doc install-plugins
-+install: install-bin install-conf install-doc install-plugins install-header
- 
- # VDR binary:
- 
-@@ -227,6 +228,13 @@ install-plugins: plugins
- 	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
- 	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
- 
-+# Header files:
-+
-+install-header:
-+	@mkdir -p $(DESTDIR)$(HEADERDIR)/vdr $(DESTDIR)$(HEADERDIR)/vdr/libsi
-+	@cp *.h Make.config $(DESTDIR)$(HEADERDIR)/vdr
-+	@cp libsi/*.h $(DESTDIR)$(HEADERDIR)/vdr/libsi
-+
- # Source documentation:
- 
- srcdoc:
diff --git a/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff b/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff
deleted file mode 100644
index e8d7d63fc458..000000000000
--- a/media-video/vdr/files/vdr-add-svdrp-down-0.1.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-Written by Matthias Schwarzott <zzam@gentoo.org>
-
-
-GENTOO_USE: !shutdown_rewrite
-GENTOO_CAP: CAP_SHUTDOWN_SVDRP
-
-diff -ru --exclude='*.o' vdr-1.3.36-orig/svdrp.c vdr-1.3.36/svdrp.c
---- vdr-1.3.36-orig/svdrp.c	2005-12-29 00:02:26.000000000 +0100
-+++ vdr-1.3.36/svdrp.c	2005-12-29 00:18:45.000000000 +0100
-@@ -293,6 +293,9 @@
-   "    Updates a timer. Settings must be in the same format as returned\n"
-   "    by the LSTT command. If a timer with the same channel, day, start\n"
-   "    and stop time does not yet exists, it will be created.",
-+  "DOWN [ <minutes> ]\n"
-+  "    Starts an automatic shutdown (with 5 minutes waiting time) in given\n"
-+  "    minutes or now if no number was given.",
-   "VOLU [ <number> | + | - | mute ]\n"
-   "    Set the audio volume to the given number (which is limited to the range\n"
-   "    0...255). If the special options '+' or '-' are given, the volume will\n"
-@@ -1342,6 +1345,16 @@
-      Reply(501, "Missing timer settings");
- }
- 
-+extern time_t LastActivity; 
-+void cSVDRP::CmdDOWN(const char *Option)
-+{
-+  if (isnumber(Option))
-+     LastActivity = time(NULL) - Setup.MinUserInactivity*60 + strtol(Option, NULL, 10)*60;
-+  else
-+     LastActivity = time(NULL) - Setup.MinUserInactivity*60;
-+  Reply(250, "Automatic shutdown triggered");
-+}
-+	
- void cSVDRP::CmdVOLU(const char *Option)
- {
-   if (*Option) {
-@@ -1413,6 +1426,7 @@
-   else if (CMD("STAT"))  CmdSTAT(s);
-   else if (CMD("UPDT"))  CmdUPDT(s);
-   else if (CMD("VOLU"))  CmdVOLU(s);
-+  else if (CMD("DOWN"))  CmdDOWN(s);
-   else if (CMD("QUIT"))  Close(true);
-   else                   Reply(500, "Command unrecognized: \"%s\"", Cmd);
- }
-diff -ru --exclude='*.o' vdr-1.3.36-orig/svdrp.h vdr-1.3.36/svdrp.h
---- vdr-1.3.36-orig/svdrp.h	2005-12-29 00:02:26.000000000 +0100
-+++ vdr-1.3.36/svdrp.h	2005-12-30 02:28:08.000000000 +0100
-@@ -59,6 +59,7 @@
-   void CmdDELC(const char *Option);
-   void CmdDELR(const char *Option);
-   void CmdDELT(const char *Option);
-+  void CmdDOWN(const char *Option);
-   void CmdEDIT(const char *Option);
-   void CmdGRAB(const char *Option);
-   void CmdHELP(const char *Option);
-diff -ru --exclude='*.o' vdr-1.3.36-orig/vdr.c vdr-1.3.36/vdr.c
---- vdr-1.3.36-orig/vdr.c	2005-12-29 00:02:26.000000000 +0100
-+++ vdr-1.3.36/vdr.c	2005-12-29 00:09:49.000000000 +0100
-@@ -89,6 +89,8 @@
-   exit(1);
- }
- 
-+time_t LastActivity;
-+
- int main(int argc, char *argv[])
- {
-   // Save terminal settings:
-@@ -395,7 +397,7 @@
-   int PreviousChannel[2] = { 1, 1 };
-   int PreviousChannelIndex = 0;
-   time_t LastChannelChanged = time(NULL);
--  time_t LastActivity = 0;
-+  LastActivity = 0; // now being a global variable
-   time_t LastCamMenu = 0;
-   int MaxLatencyTime = 0;
-   bool ForceShutdown = false;
diff --git a/media-video/vdr/files/vdr-set-dumpable.diff b/media-video/vdr/files/vdr-set-dumpable.diff
deleted file mode 100644
index 251eda35891a..000000000000
--- a/media-video/vdr/files/vdr-set-dumpable.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch by Matthias Schwarzott <zzam@gentoo.org>
-
-diff -ru vdr-1.4.3-vanilla/vdr.c vdr-1.4.3/vdr.c
---- vdr-1.4.3-vanilla/vdr.c	2006-10-12 18:04:50.000000000 +0200
-+++ vdr-1.4.3/vdr.c	2006-10-12 18:05:41.000000000 +0200
-@@ -103,8 +103,8 @@
-         fprintf(stderr, "vdr: cannot set user id %u: %s\n", (unsigned int)user->pw_uid, strerror(errno));
-         return false;
-         }
--     if (prctl(PR_SET_DUMPABLE, 2, 0, 0, 0) < 0) {
--        fprintf(stderr, "vdr: warning - cannot set dumpable: %s\n", strerror(errno));
-+     if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
-+        esyslog("vdr: warning - cannot set dumpable: %s", strerror(errno));
-         // always non-fatal, and will not work with kernel < 2.6.13
-         }
-      }
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 5f4c80b3c451..b50c11d447f2 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -7,12 +7,8 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<use>
-		<flag name="aio">Use &quot;all in one&quot; patch (or its successor &quot;liemikuutio&quot;) with much additional features</flag>
 		<flag name="analogtv">Add support for the analogtv plugin</flag>
 		<flag name="atsc">Support for NorthAmerican Broadcast ( rudimentary )</flag>
-		<flag name="bigpatch">Enables almost all additional features flying around on the net (including aio)</flag>
-		<flag name="child-protection">Enable support for the plugin vdr-pin (Protecting some recordings / channels with a PIN)</flag>
-		<flag name="cmdctrl">allows switching remote control on/off</flag>
 		<flag name="cmdreccmdi18n">loads translated commands and reccommands files if existing</flag>
 		<flag name="cmdsubmenu">Allows the creation of submenus in the commands menu</flag>
 		<flag name="cutterlimit">Limit IO bandwith used for cutting</flag>
@@ -21,7 +17,6 @@
 		<flag name="ddepgentry">remove duplicate EPG entries</flag>
 		<flag name="deltimeshiftrec">Auto delete timeshift recordings</flag>
 		<flag name="dolbyinrec">add a dedicated switch to control recording of dolby digital</flag>
-		<flag name="dolby-record-switch">Allows to control separately to record / to replay dolby digital</flag>
 		<flag name="dvbplayer">Use some special mpeg-repacker features. Most usable for old recordings or software output devices.</flag>
 		<flag name="dvbsetup">Setup for AC3 transfer, disable primary tuner</flag>
 		<flag name="dvdarchive">DMH DVD - Archiv ( used by vdr-burn-0.1.0_* )</flag>
@@ -29,7 +24,6 @@
 		<flag name="dvlfriendlyfnames">filter file names on recording</flag>
 		<flag name="dvlrecscriptaddon">enhancement for record-script</flag>
 		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
-		<flag name="dxr3-audio-denoise">Mutes audio noise occurring with dxr3-cards using analog audio-out when e.g. cutting</flag>
 		<flag name="dxr3">Enable tweaks to improve vdr behaviour on dxr3-cards</flag>
 		<flag name="em84xx">Add support for em84xx plugin</flag>
 		<flag name="graphtft">support for grapftft plugin up from vdr-graphtft-0.1.7</flag>
@@ -40,7 +34,6 @@
 		<flag name="lircsettings">Allows to change lirc settings delay, freq and timeout values in OSD</flag>
 		<flag name="livebuffer">does timeshifting/background recording all the time, allows to rewind live TV</flag>
 		<flag name="lnbshare">Enables support for two or more dvb cards sharing the same cable to the lnb</flag>
-		<flag name="lnbsharing">Enables support for two or more dvb cards sharing the cable to the lnb</flag>
 		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
 		<flag name="menuorg">Enables support for the menuorg-plugin</flag>
 		<flag name="noepg">Adds code to selectively disable epg-reception for specific channels</flag>
@@ -50,14 +43,9 @@
 		<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
 		<flag name="settime">set system time per script instead of via syscal</flag>
 		<flag name="setup">Enable support for the plugin vdr-setup</flag>
-		<flag name="setup-plugin">Enable support for the plugin vdr-setup</flag>
-		<flag name="shutdown_rewrite">use rewritten shutdown code from vdr-1.5</flag>
 		<flag name="softosd">Soft OSD fading with FF-Cards</flag>
 		<flag name="sortrecords">allows to change sort order of recordings</flag>
 		<flag name="sourcecaps">Adds the ability to define capabilities of dvb-cards (e.g. card1 can receive Sat @28.2E)</flag>
-		<flag name="submenu">Enable support for the plugin vdr-submenu.</flag>
-		<flag name="subtitles">Enable support for the subtitles-plugin</flag>
-		<flag name="switchtimer">support for timer that do not record but only switch to a channel</flag>
 		<flag name="syncearly">start live display as soon as possible, not waiting for sync of audio and video</flag>
 		<flag name="timercmd">Adds submenu for user defined commands in timer menu</flag>
 		<flag name="timerinfo">Show with chars +/- if space on HD will suffice for a timer</flag>
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
deleted file mode 100644
index 7084680f7ae9..000000000000
--- a/media-video/vdr/vdr-1.4.6.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.15 2010/03/22 16:35:00 ssuominen Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE="vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
-	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
-	child-protection yaepg setup-plugin submenu subtitles rotor noepg"
-
-PATCHSET_V=1
-PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
-
-MY_P="${P%_p*}"
-S="${WORKDIR}/${MY_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
-	mirror://gentoo/${PATCHSET_NAME}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND=">=media-libs/jpeg-8
-	sys-libs/libcap"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR="/usr/$(get_libdir)/vdr/plugins"
-CONF_DIR=/etc/vdr
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-add_cap() {
-	local ARG
-	for ARG; do
-		CAPS="${CAPS}\n${ARG}=1"
-	done
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-	else
-		unpack "${PATCHSET_NAME}".tar.bz2
-		PATCHSET_DIR="${WORKDIR}/${PATCHSET_NAME}"
-
-		# Fix logic bigpatch+noepg, Bug #193550
-		sed -i "${PATCHSET_DIR}"/apply_patchset.sh \
-			-e 's/use noepg/use noepg \&\& use !bigpatch/'
-	fi
-
-	cd "${S}"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	source "${PATCHSET_DIR}"/apply_patchset.sh
-	apply_vdr_patchset "${PATCHSET_DIR}"
-
-	if use !vanilla; then
-		if use setup-plugin && use submenu; then
-			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
-		fi
-	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
-
-		elog
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			elog "Applying local patches"
-		else
-			elog "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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_SHUTDOWN_SVDRP \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto "${VDR_INCLUDE_DIR}"
-	doins *.h
-	doins Make.config
-
-	insinto "${VDR_INCLUDE_DIR}"/libsi
-	doins libsi/*.h
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	insinto "${CONF_DIR}"
-	doins *.conf channels.conf.*
-
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/PLUGINS/lib
-	fi
-
-	if use setup-plugin; 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=$?
-}
-
-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-plugin; 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-plugin\""
-			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
-
-	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.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
deleted file mode 100644
index 4ce726b8ea30..000000000000
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.13 2010/03/22 16:35:00 ssuominen Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter
-	volctrl lircsettings"
-
-IUSE="vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="42"
-EXT_P=VDR-Extensions-Patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-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/${P}.tar.bz2
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-#http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND=">=media-libs/jpeg-8
-	sys-libs/libcap"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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() {
-
-	count=0
-
-	for flag in menuorg setup submenu; do
-		use $flag && count=$((count+1))
-	done
-
-	if [ $count -gt 1 ] ; then
-		echo
-		eerror "Please use only one of these USE-Flags"
-		eerror "submenu setup menuorg"
-		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="genfontfile.c $(echo font*.c)"
-	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}"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-	epatch "${FILESDIR}"/${P}-gcc-4.3.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${fname}"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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 $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			use $flag && enable_patch ${flag}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null || die "make depend failed"
-		eend 0
-
-		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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-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}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}"
-	local f
-	rm *vdr-1.5* 2>/dev/null
-	for f in BUGS README* HISTORY* patch.list; do
-		[[ -f ${f} ]] || break
-		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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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=$?
-}
-
-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
-	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.4.7-r11.ebuild b/media-video/vdr/vdr-1.4.7-r11.ebuild
deleted file mode 100644
index 9a630922d085..000000000000
--- a/media-video/vdr/vdr-1.4.7-r11.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.7 2010/03/22 16:35:00 ssuominen Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter
-	volctrl lircsettings deltimeshiftrec"
-
-IUSE="vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="54"
-EXT_P=VDR-Extensions-Patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-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/${P}.tar.bz2
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-#http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND=">=media-libs/jpeg-8
-	sys-libs/libcap"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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() {
-
-	count=0
-
-	for flag in menuorg setup submenu; do
-		use $flag && count=$((count+1))
-	done
-
-	if [ $count -gt 1 ] ; then
-		echo
-		eerror "Please use only one of these USE-Flags"
-		eerror "submenu setup menuorg"
-		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="genfontfile.c $(echo font*.c)"
-	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}"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-gcc-4.3.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${fname}"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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 $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			use $flag && enable_patch ${flag}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null || die "make depend failed"
-		eend 0
-
-		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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-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}"
-
-	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.5* 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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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=$?
-}
-
-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
-	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.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
deleted file mode 100644
index ade15a123561..000000000000
--- a/media-video/vdr/vdr-1.4.7-r12.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.8 2010/03/22 16:35:00 ssuominen Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter
-	volctrl lircsettings deltimeshiftrec"
-
-IUSE="vanilla shutdown_rewrite ${IUSE_EXTENSIONS}"
-
-EXT_V="54"
-EXT_P=VDR-Extensions-Patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-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/${P}.tar.bz2
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-#http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND=">=media-libs/jpeg-8
-	sys-libs/libcap"
-
-DEPEND="${COMMON_DEPEND}
-	media-tv/linuxtv-dvb-headers
-	dev-util/unifdef"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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() {
-
-	count=0
-
-	for flag in menuorg setup submenu; do
-		use $flag && count=$((count+1))
-	done
-
-	if [ $count -gt 1 ] ; then
-		echo
-		eerror "Please use only one of these USE-Flags"
-		eerror "submenu setup menuorg"
-		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="genfontfile.c $(echo font*.c)"
-	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}"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-gcc-4.3.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${fname}"
-
-		if use shutdown_rewrite; then
-			epatch "${EXT_DIR}/vdr-1.4.7-ext44_shutdown-rewrite.diff"
-			add_cap CAP_SHUTDOWN_AUTO_RETRY
-		else
-			epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-			add_cap CAP_SHUTDOWN_SVDRP
-		fi
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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 $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			use $flag && enable_patch ${flag}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null || die "make depend failed"
-		eend 0
-
-		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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-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}"
-
-	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.5* 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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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=$?
-}
-
-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
-	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"
-}