Cleanup.

(Portage version: 2.2_rc50/cvs/Linux i686)

9 files changed, 11 insertions, 729 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 567adc6b9976..b8103c47341b 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.48 2009/11/18 20:59:36 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.49 2009/11/20 08:59:55 zzam Exp $
+
+  20 Nov 2009; Matthias Schwarzott <zzam@gentoo.org>
+  -vdr-xineliboutput-1.0.0_rc1.ebuild, -vdr-xineliboutput-1.0.0_rc2.ebuild,
+  -vdr-xineliboutput-1.0.0.ebuild,
+  -vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild,
+  -vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild,
+  -files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff,
+  -files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff,
+  -vdr-xineliboutput-1.0.1.ebuild:
+  Cleanup.
 
 *vdr-xineliboutput-1.0.4_p20091118 (18 Nov 2009)
 
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff
deleted file mode 100644
index bfb1d5c0db6d..000000000000
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_xineliboutput-1.0.0rc2-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
-## http://toms-cafe.de/vdr/download/xineliboutput-1.0.0rc2-1.5.3.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.3.
-
-@DPATCH@
---- xineliboutput-1.0.0~rc2/tools/iconv.h
-+++ xineliboutput-1.0.0~rc2/tools/iconv.h
-@@ -40,7 +40,11 @@ cIConv::cIConv(const char *SrcCharset, c
-   if(!SrcCharset)
-     SrcCharset = "UTF-8";
-   if(!DstCharset)
-+#if APIVERSNUM >= 10503
-+    DstCharset = cCharSetConv::SystemCharacterTable();
-+#else
-     DstCharset = I18nCharSets()[Setup.OSDLanguage];
-+#endif
- 
-   m_ic = iconv_open(DstCharset, SrcCharset);
-
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff
deleted file mode 100644
index 8b0bdd6727e6..000000000000
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff
+++ /dev/null
@@ -1,103 +0,0 @@
---- osd.c.~1.7.~	2007-03-14 19:51:01.000000000 +0200
-+++ osd.c	2007-09-01 11:47:04.000000000 +0300
-@@ -148,8 +148,12 @@
-   }
- }
- 
--cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y)
-+cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level)
-+#if VDRVERSNUM >= 10509
-+    : cOsd(x, y, Level), m_IsVisible(true)
-+#else
-     : cOsd(x, y), m_IsVisible(true)
-+#endif
- {
-   TRACEF("cXinelibOsd::cXinelibOsd");
- 
-@@ -341,7 +345,11 @@
-   }
- }
- 
-+#if VDRVERSNUM >= 10509
-+cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top, uint Level)
-+#else
- cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top)
-+#endif
- {
-   TRACEF("cXinelibOsdProvider::CreateOsd");
- 
-@@ -350,7 +358,11 @@
-   if(cXinelibOsd::m_OsdStack.First())
-     LOGMSG("cXinelibOsdProvider::CreateOsd - OSD already open !");
- 
-+#if VDRVERSNUM >= 10509
-+  cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top, Level);
-+#else
-   cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top);
-+#endif
- 
-   if(cXinelibOsd::m_OsdStack.First())
-     cXinelibOsd::m_OsdStack.First()->Hide();
---- osd.h.~1.3.~	2007-01-06 13:42:58.000000000 +0200
-+++ osd.h	2007-09-01 11:47:04.000000000 +0300
-@@ -45,7 +45,7 @@
-     friend class cXinelibOsdProvider;
- 
-   public:
--    cXinelibOsd(cXinelibDevice *Device, int x, int y);
-+    cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level = 0);
-     virtual ~cXinelibOsd();
- };
- 
-@@ -59,7 +59,11 @@
-     cXinelibOsdProvider(cXinelibDevice *Device);
-     virtual ~cXinelibOsdProvider();
- 
-+#if VDRVERSNUM >= 10509
-+    virtual cOsd *CreateOsd(int Left, int Top, uint Level);
-+#else
-     virtual cOsd *CreateOsd(int Left, int Top);
-+#endif
- 
-     static void RefreshOsd(void);
- };
---- equalizer.c.~1.2.~	2006-08-22 06:45:34.000000000 +0300
-+++ equalizer.c	2007-09-01 11:47:04.000000000 +0300
-@@ -46,7 +46,11 @@
- {
-   tArea areas [] = { {0, 0, OSD_W - 1, OSD_H - 1, 4} };
- 
-+#if VDRVERSNUM >= 10509
-+  m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0);
-+#else
-   m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y);
-+#endif
- 
-   if(m_Osd) {
-     if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) {
---- setup_menu.c.~1.34.~	2007-06-19 09:06:22.000000000 +0300
-+++ setup_menu.c	2007-09-01 11:47:04.000000000 +0300
-@@ -1537,7 +1537,11 @@
-   int i;
- 
-   if(!m_Osd)
-+#if VDRVERSNUM >= 10509
-+    m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0);
-+#else
-     m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y);
-+#endif
- 
-   if(m_Osd) {
-     if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) {
-@@ -1636,7 +1640,11 @@
-   int x, y, bit = 0;
- 
-   if(!m_Osd) {
-+#if VDRVERSNUM >= 10509
-+    m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0);
-+#else
-     m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y);
-+#endif
- 
-     if(m_Osd) {
-       if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) {
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0.ebuild
deleted file mode 100644
index 48c4fc052a96..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0.ebuild,v 1.1 2008/04/24 20:03:29 zzam Exp $
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}-1.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbcon X libextractor"
-
-RDEPEND=">=media-video/vdr-1.4.0
-		>=media-libs/xine-lib-1.1.1
-		media-libs/jpeg
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-			x11-proto/renderproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-			x11-libs/libXrender
-		)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-NO_GETTEXT_HACK=1
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_PLUGIN_DIR=$(xine-config --plugindir)
-	if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-		eerror "Could not find xine plugin dir"
-		die "Could not find xine plugin dir"
-	fi
-	# stop some automagic overwriting the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = 1
-		XINELIBOUTPUT_VDRPLUGIN = 1
-
-		XINELIBOUTPUT_FB = $(use_onoff fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	use fbcon && dobin vdr-fbfe
-	use X && dobin vdr-sxfe
-
-	# There may be no sub-plugin, depending on use-flags
-	insinto ${VDR_PLUGIN_DIR}
-	local f
-	for f in libxineliboutput*.so.${SO_VERSION}; do
-		[[ -f "$f" ]] || continue
-		doins "${f}" || die "could not install sub-plugin ${f}"
-	done
-
-	insinto "${XINE_PLUGIN_DIR}"
-	doins xineplug_inp_*.so
-
-	insinto "${XINE_PLUGIN_DIR}"/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild
deleted file mode 100644
index 9a94fd653eb2..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc1.ebuild,v 1.4 2008/01/20 22:55:39 zzam Exp $
-
-inherit vdr-plugin eutils multilib
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-#TIMESTAMP=CVS-${PV##*_p}000000
-#MY_P=${PN}-${TIMESTAMP}
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="fbcon X"
-
-RDEPEND=">=media-video/vdr-1.3.42
-		>=media-libs/xine-lib-1.1.1
-		media-libs/jpeg
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-		)"
-
-#MY_PV=${PV%_p*}
-#MY_PV=${MY_PV/_/}
-S=${WORKDIR}/xineliboutput-${MY_PV}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-enable_in_makefile() {
-	local opt
-	for opt; do
-		sed -i "/^#${opt}.*= 1/s-^#--" Makefile
-	done
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
-
-	enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN
-	use fbcon && enable_in_makefile XINELIBOUTPUT_FB
-	use X && enable_in_makefile XINELIBOUTPUT_X11
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dobin vdr-fbfe vdr-sxfe
-
-	insinto ${VDR_PLUGIN_DIR}
-	doins *.so.${MY_PV} || die "could not install sub-plugins"
-
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
-	doins xineplug_inp_*.so
-
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
deleted file mode 100644
index e83e68f172e7..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.8 2008/04/18 20:40:16 zzam Exp $
-
-inherit vdr-plugin eutils multilib
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-#TIMESTAMP=CVS-${PV##*_p}000000
-#MY_P=${PN}-${TIMESTAMP}
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="fbcon X"
-
-RDEPEND=">=media-video/vdr-1.3.42
-		>=media-libs/xine-lib-1.1.1
-		media-libs/jpeg
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-		)"
-
-#MY_PV=${PV%_p*}
-#MY_PV=${MY_PV/_/}
-S=${WORKDIR}/xineliboutput-${MY_PV}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-PATCHES=("${FILESDIR}/${P}-vdr-1.5.3.diff"
-	"${FILESDIR}/${P}-vdr-1.5.9.diff")
-
-NO_GETTEXT_HACK=1
-
-enable_in_makefile() {
-	local opt
-	for opt; do
-		sed -i "/^#${opt}.*= 1/s-^#--" Makefile
-	done
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
-
-	enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN
-	use fbcon && enable_in_makefile XINELIBOUTPUT_FB
-	use X && enable_in_makefile XINELIBOUTPUT_X11
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dobin vdr-fbfe vdr-sxfe
-
-	insinto ${VDR_PLUGIN_DIR}
-	doins *.so.${MY_PV} || die "could not install sub-plugins"
-
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
-	doins xineplug_inp_*.so
-
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild
deleted file mode 100644
index a9af3d401a57..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild,v 1.4 2008/03/12 13:04:02 zzam Exp $
-
-inherit vdr-plugin eutils multilib versionator
-
-#MY_PV=${PV/_/}
-#MY_P=${PN}-${MY_PV}
-MY_PV=${PV##*_p}
-MY_P=${PN}-cvs-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-#SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tar.bz2"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbcon X"
-
-RDEPEND=">=media-video/vdr-1.3.42
-		>=media-libs/xine-lib-1.1.1
-		media-libs/jpeg
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-		)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-#PATCHES="${FILESDIR}/${P}-vdr-1.5.3.diff
-#	${FILESDIR}/${P}-vdr-1.5.9.diff"
-
-NO_GETTEXT_HACK=1
-
-set_var_in_makefile() {
-	local opt="XINELIBOUTPUT_$1"
-	local value="$2"
-	sed -i "s-^#${opt}.*= 1-${opt} = ${value}-" Makefile
-}
-
-apply_useflag() {
-	local opt="$1"
-	local flag="$2"
-	local value=0
-	use $flag && value=1
-	set_var_in_makefile "$opt" "$value"
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_PLUGIN_DIR=$(xine-config --plugindir)
-	if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-		eerror "Could not find xine plugin dir"
-		die "Could not find xine plugin dir"
-	fi
-
-	set_var_in_makefile VDRPLUGIN 1
-	set_var_in_makefile XINEPLUGIN 1
-	apply_useflag FB fbcon
-	apply_useflag X11 X
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	use fbcon && dobin vdr-fbfe
-	use X && dobin vdr-sxfe
-
-	# There may be no sub-plugin, depending on use-flags
-	insinto ${VDR_PLUGIN_DIR}
-	local f
-	for f in libxineliboutput*.so.${SO_VERSION}; do
-		[[ -f "$f" ]] || continue
-		doins "${f}" || die "could not install sub-plugin ${f}"
-	done
-
-	insinto "${XINE_PLUGIN_DIR}"
-	doins xineplug_inp_*.so
-
-	insinto "${XINE_PLUGIN_DIR}"/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild
deleted file mode 100644
index d191fb9ed01a..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild,v 1.4 2008/02/18 00:40:05 mr_bones_ Exp $
-
-inherit vdr-plugin eutils multilib
-
-#MY_PV=${PV/_/}
-#MY_P=${PN}-${MY_PV}
-MY_PV=${PV##*_p}
-MY_P=${PN}-cvs-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-#SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tar.bz2"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbcon X"
-
-RDEPEND=">=media-video/vdr-1.3.42
-		>=media-libs/xine-lib-1.1.1
-		media-libs/jpeg
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-		)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-#PATCHES="${FILESDIR}/${P}-vdr-1.5.3.diff
-#	${FILESDIR}/${P}-vdr-1.5.9.diff"
-
-NO_GETTEXT_HACK=1
-
-set_var_in_makefile() {
-	local opt="XINELIBOUTPUT_$1"
-	local value="$2"
-	sed -i "s-^#${opt}.*= 1-${opt} = ${value}-" Makefile
-}
-
-apply_useflag() {
-	local opt="$1"
-	local flag="$2"
-	local value=0
-	use $flag && value=1
-	set_var_in_makefile "$opt" "$value"
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
-
-	set_var_in_makefile VDRPLUGIN 1
-	set_var_in_makefile XINEPLUGIN 1
-	apply_useflag FB fbcon
-	apply_useflag X11 X
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	use fbcon && dobin vdr-fbfe
-	use X && dobin vdr-sxfe
-
-	insinto ${VDR_PLUGIN_DIR}
-	doins *.so.${SO_VERSION} || die "could not install sub-plugins"
-
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
-	doins xineplug_inp_*.so
-
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.1.ebuild
deleted file mode 100644
index 00fa7b8f7d2e..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.1.ebuild,v 1.1 2008/05/12 17:31:09 zzam Exp $
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbcon X libextractor"
-
-RDEPEND=">=media-video/vdr-1.4.0
-		>=media-libs/xine-lib-1.1.1
-		media-libs/jpeg
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-			x11-proto/renderproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-			x11-libs/libXrender
-		)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-NO_GETTEXT_HACK=1
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_PLUGIN_DIR=$(xine-config --plugindir)
-	if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-		eerror "Could not find xine plugin dir"
-		die "Could not find xine plugin dir"
-	fi
-	# stop some automagic overwriting the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = 1
-		XINELIBOUTPUT_VDRPLUGIN = 1
-
-		XINELIBOUTPUT_FB = $(use_onoff fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	use fbcon && dobin vdr-fbfe
-	use X && dobin vdr-sxfe
-
-	# There may be no sub-plugin, depending on use-flags
-	insinto ${VDR_PLUGIN_DIR}
-	local f
-	for f in libxineliboutput*.so.${SO_VERSION}; do
-		[[ -f "$f" ]] || continue
-		doins "${f}" || die "could not install sub-plugin ${f}"
-	done
-
-	insinto "${XINE_PLUGIN_DIR}"
-	doins xineplug_inp_*.so
-
-	insinto "${XINE_PLUGIN_DIR}"/post
-	doins xineplug_post_*.so
-}