cleanup on depends on vdr-plugin.eclass

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

8 files changed, 14 insertions, 482 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 29fb682a0e91..fc0a7066ace3 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-softdevice
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.70 2012/11/04 19:17:59 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.71 2014/01/08 18:59:49 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/patches-0.4.0/new-ffmpeg-extern-c.diff, -files/patches-0.4.0/series,
+  -vdr-softdevice-0.5.0.20080922.ebuild,
+  -files/vdr-softdevice-0.5.0.20080922-offsett.patch,
+  -vdr-softdevice-0.5.0.20090218.ebuild, -vdr-softdevice-0.5.0.20090630.ebuild:
+  cleanup on depends on vdr-plugin.eclass
 
 *vdr-softdevice-0.5.0.20110417 (04 Nov 2012)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 09e65f37d923..835da7a4edad 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -2,27 +2,18 @@
 Hash: SHA256
 
 AUX confd 431 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e SHA512 4da15290e6ee52ad8e2046e1e3ec1de07b94b23f2561900886570643b690cefc5d2747de38d0263d15f20a3af7b4b499daef4372d6f166ad5304bf49881a8cf4 WHIRLPOOL 99e5d14d44ef8071369112622710a74c387def2d28dc94795ae3c75c0f071eb10b31dca87b7f9bdf97b84368fdffd42a1aaa752043e0afba387e562d1e7f5619
-AUX patches-0.4.0/new-ffmpeg-extern-c.diff 1526 SHA256 4840b91d58672a9f98a04d84fa68e5e74baab9728f31907ab47a55cdfd9d06b0 SHA512 c0185346c5858579667b62b838ca065e1d32d1d05d2b3d42095307f5b56ee2715f309dcd5e7d9cf2fd729feecedec866e3bb8f77742fc7117f241f1153892813 WHIRLPOOL 9280dec66cd7e3365f18bd249558b382c84cb8733ad189938356d4d90cdace41981417b9f73a70307f22cffb255ccf6ff0aa2357d6e7aacab4a7b20b4982d2e0
-AUX patches-0.4.0/series 55 SHA256 34c9603502734813edd0ffb5d9700b14026850564bcf18088e9870151d662591 SHA512 adaf5f1d1657ae6e0717d5c27922d3c89515e9cb968f9735dbc32b6df37bf6107914eec6fdd1cbbd740e6ecb0881a33d2c939a838ae9e3be6e10986ea18719d7 WHIRLPOOL 547740233f8acc264c2c6b3094c8d22fb702ecaa20d93cd69df377837852ef732b432a0c279dd5adb1798aa4e5605e51bd797857e15d870f2c281b3d2300e2d8
 AUX patches-0.4.0/shm-fullscreen-parameter.diff 737 SHA256 2665dd3d2e6059ec61ad8707af7f2b532485d49c8771f5875e0343a7325b48eb SHA512 d26a4ce222567249a38a947c9daf0733939b2531f218ebf2c8d5fbaa434782516dc255516e249fba7618814fef401f1a744a9b73129f5d82066e71c40ce1efb8 WHIRLPOOL 57ba737b5863942b5658b57d97750ee4ae271ac22d9acf36a2e7f5f40811d3e1e1cc3243b1bc3c64d2225941b0f5423bf34609af311ac4d75fb18cd1345cb3ce
 AUX rc-addon.sh 321 SHA256 d6eaa97c313fca31920f7bcc6d060c3dac9c4ee2624bfff4b0c59fa4ff91153d SHA512 8c7f1bdcc672c7f598f62688f449d09cb10ec2359f9ab36dfea350d77f83598dd93a908bae1fdd5abb2aece38b499b101516037f23cc407f4640a161d8d860f7 WHIRLPOOL cd0c3613164ba03ac97af77fffb509ccdb48f6472a0135f18af0d82a65369d91e87a9578ebc605c034b43cad364a1df9d516f426cbf06510756311b8458edc40
 AUX softdevice-cvs-20110417_ffmpeg-0.10.2.diff 5439 SHA256 b7c00248646b470b9de9fa6bff94f3356f8f026f865fe43c51b598be0efa4a2f SHA512 2ac8717412fe30ccc3d3b1062ec61747ffcfe9a55d455afe3c4e2c243b5d18de8a5eadb6f935dfb582a8c02fdbf384e5093f0d5062013c9716ba18567093c688 WHIRLPOOL 1b492995d59d7391d78f076136af933c720aff72171b66e2348eacc58e360ebb70b0e731e1676928b64338edc9de35ac2407359a61db399c6451f8bae0756082
-AUX vdr-softdevice-0.5.0.20080922-offsett.patch 1298 SHA256 ccf16a8e94b6b9a0cb284b1e11595858b330f1307b2157eb1224db6b91e78661 SHA512 2bd9191e733cea6d412c725730b28fbd2d67fe9d8133d13006fda6f06ab2a1aae8190e86e62914473e8a30874730525ef2cdc0eaa2288eae5f5ca462beca67d8 WHIRLPOOL 82c59357ef7002f3d7cf91701593217edf4b000a4b747cb096407d30a94ad0afc82633d59467b905bae50691017dd53079c65aa6d27dc3dce24eac7b61693ea4
-DIST vdr-softdevice-cvs-20080922.tar.bz2 161453 SHA256 95588510261069c3d71f466350bb8eee524d70f2b84ba5120745f01b011c8de5
-DIST vdr-softdevice-cvs-20090218.tar.bz2 161620 SHA256 79f03506b40da140ad31be0849a9e33f7fb223eaa5f070fa1ade906b863548f6
-DIST vdr-softdevice-cvs-20090630.tar.bz2 162845 SHA256 02b6c4277bcc77df2e488bb0ba3efd59c4fcaa61ec6f3ba88ccf77c4e1d5a609
 DIST vdr-softdevice-cvs-20110417.tar.bz2 163021 SHA256 350961406a2e95ad8efda95e591776be28e2f509d28f4b460f9d08a543835f87 SHA512 dc310b2c91286ade055a89d2826dde22426971b15f243c06eb29f16950998a2a6a3874002e6aea8c0f5d926a493d30a14ab8e4e08a110f4e9054cef3f409f6cf WHIRLPOOL e7888eafea512d27b7268631291ebbb8730241f9918f2f1407791d01c853177317c20bffa2fae944df61cd42247cbde5e21357df7ea394f03b369282c2e4f757
-EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3511 SHA256 60efcb3d0d80cb2e6ca9ee05dad0115bb261f1de81b6581929b09b297b0fb5f0 SHA512 c24857c75e9b837743438041e54cb136d3c2b4733aa0aa967c3929fcf771807568f117bf140cf71c17fd617338c150d379d6ab347a84204ae9e80e33695a6bc1 WHIRLPOOL fa4a3598bd81998a6bb747630ef88ecc13319a7968ca07e18c4f38a9ae0f21190af064fecdfda5883ab44aa9e1437066d1eb3d69f3cadcb6108d61f9f0b6dd62
-EBUILD vdr-softdevice-0.5.0.20090218.ebuild 3258 SHA256 1e4b2e0cfd1651467a74a4f880829a2461db3cc43c50d96972aac11037a253a8 SHA512 a62159724a0ea16f5133c40ae90f90c6199f6949c40cf5f08b00cfe2288b7ac7cc8468503d252b74c5887d79fe934fb33d09f3d0af87a2437924774c6682162c WHIRLPOOL 427b5e08e9ea4108c97ea094e539019fd07a4df228a1d30915fc648ff8c0097cbc1e5c8d2162fc3be409bb1a0be5b7ab2d00c87176f094709ad0b3d470f077eb
-EBUILD vdr-softdevice-0.5.0.20090630.ebuild 3028 SHA256 3c25cfd6bfed1c18efadecbb1b9d14bea98065c43a6ca789ec6690f5edb43d8c SHA512 174f731452851823f7fd6837c50c2f84cbf5b28661b59fdc9189eb781e884c69defb049f4e10afdf8df3d635f5a0c3b4c7d33c9d52f6c59b838ed21832a0aabc WHIRLPOOL de187b6707520c2f8564c2554d27e119da2f048af71a6eb9590d725b4a500e27223e06d03bea10487fa505205071b4d443bd9df68a5fbe0f2145540fd267506e
 EBUILD vdr-softdevice-0.5.0.20110417.ebuild 3080 SHA256 d985ac2d9bfcfde39f902602ea0e806d3b284792da8f3c8d725e2374f6093ebb SHA512 7b11ac06e41ead36b1f8f00482a9d4743837992f2af3c6d552c3dbc9133f7aff1d5aa5bc432fa01ac3fd75c9e7260d59b1fbae3b3958aa72878b4bf13332d276 WHIRLPOOL a413fa00e84fee0220f50384e0b84463c62e0b67a6053f628a6cf7802d84a2e9d4c6ab7d14fe215e3f67e2c45f7e08b10fe4501bad1ba1dbbb04f6e556d4efab
-MISC ChangeLog 16048 SHA256 00f45ecb3fcc627f44e70c9cd58a13c4267e11773353288026a4d41c54293626 SHA512 dcb69fb3c39f5f77374062b059a79be3df68dc1e94410035d8867797bd88df20b6b4cc7f363ec29c9220e1ec1d508903cf13c7fcd0886086a315de5e7b7df581 WHIRLPOOL f933ecee51f6d0eb90a96333b87790bc1aff9327aeb9155b6f046ba06aad5279ea65ab5a8e7636a37508425f409c792d27a582449e35321799576bba47d11360
+MISC ChangeLog 16399 SHA256 2d10be4db44651c82ef6f9890f186054f458ba29878966607338e4e123fcec92 SHA512 bf17e7353bc16e233d28c7ab59cc2bee3e34611d598db79788dfd2e23376e4b437b54e8cb79bd393e620f3fd8fcb13f961a985af9ee0502ef96279f155d46d7e WHIRLPOOL 62c09916909c9ee98f4350ed238737a71bb3a77af1084900efb634c8264eae1657fb8e55685176dd7d26ef1814d3bf467ba6dd14c81259c16c89567bf8cc7c16
 MISC metadata.xml 315 SHA256 0e99bf3f1538b2fef87bd304d896b78a5ddfb8a75277550c261801dcd3c4e279 SHA512 86044d146f4412b20b422263a15a5458339e55f9beb2e9aeaf506e366610419eb5b07cc8c3ac9380b1c27bb50e57ddfe3ec94d58d2f2f54ab185155b4a77027d WHIRLPOOL eefa56135016ed35f90596e3b713a80024e9161d12730a8c85d58a8580571af9e3cd42dcc72829b8129b1826f64833cdc57b6bf1288d179f4dde786177dac736
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFQlr9sdn07HTTCgIoRCAPIAKCbmu2lIHYp2zRLygom7oqDraArGwCdEtzX
-CtpxlMcY2ZOIZC/1j/r7VpU=
-=W2OL
+iD8DBQFSzaAqdn07HTTCgIoRCEwHAKCwFjfKiJcK3RzQgmtT+Bic/AMZ/QCgnJLg
+1pj5OoQJCn9qIF708YcX5FA=
+=UjnE
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
deleted file mode 100644
index e5148463b03b..000000000000
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: softdevice-cvs/configure
-===================================================================
---- softdevice-cvs.orig/configure
-+++ softdevice-cvs/configure
-@@ -173,9 +173,11 @@ test_ffmpeg()
-   ffmpeg="yes";
- cat > ${TMPC} << EOF
- #define __STDC_CONSTANT_MACROS
-+extern "C" {
- #include <stdlib.h>
- #include <avcodec.h>
- #include <avformat.h>
-+}
- int main(void) {
- /*  if ( avcodec_build() != LIBAVCODEC_BUILD ) {
-      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
-@@ -249,9 +251,11 @@ test_swscale()
- cat > ${TMPC} << EOF
- #define __STDC_CONSTANT_MACROS
- #include <stdlib.h>
-+extern "C" {
- #include <avcodec.h>
- #include <avformat.h>
- #include <swscale.h>
-+}
- int main(void) {
- /*  if ( avcodec_build() != LIBAVCODEC_BUILD ) {
-      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
-Index: softdevice-cvs/VideoFilter.h
-===================================================================
---- softdevice-cvs.orig/VideoFilter.h
-+++ softdevice-cvs/VideoFilter.h
-@@ -14,8 +14,10 @@
- 
- #ifdef PP_LIBAVCODEC
- #include <stdint.h> //needed by postproc.h
-+extern "C" {
-   #include <postprocess.h>
-   //#include <postproc/postprocess.h>
-+}
- #endif //PP_LIBAVCODEC
- 
- #include "video.h"
-@@ -60,7 +62,9 @@ public:
- };
- 
- #ifdef USE_SWSCALE
-+extern "C" {
- #include <swscale.h>
-+}
- #endif
- class cImageConvert : public cVideoFilter {
-         sPicBuffer *outBuf;
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
deleted file mode 100644
index 3e52f157fc9e..000000000000
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/series
+++ /dev/null
@@ -1,2 +0,0 @@
-new-ffmpeg-extern-c.diff
-shm-fullscreen-parameter.diff
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch
deleted file mode 100644
index 2c1824bf96e8..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: softdevice-cvs-20080922/mpeg2decoder.c
-===================================================================
---- softdevice-cvs-20080922.orig/mpeg2decoder.c
-+++ softdevice-cvs-20080922/mpeg2decoder.c
-@@ -1016,7 +1016,7 @@ static int read_packet_RingBuffer(void *
- };
- 
- #if LIBAVFORMAT_BUILD >4625
--static offset_t seek_RingBuffer(void *opaque, offset_t offset, int whence)
-+static int64_t seek_RingBuffer(void *opaque, int64_t offset, int whence)
- #else
- static int seek_RingBuffer(void *opaque, offset_t offset, int whence)
- #endif
-@@ -1135,7 +1135,7 @@ start:
-     return 0;
- };
- 
--int cMpeg2Decoder::seek(offset_t offset, int whence) {
-+int cMpeg2Decoder::seek(int64_t offset, int whence) {
-    printf("unimplemented: seek offset %lld whence %d\n", (long long int)offset, whence);
-    return -EINVAL;
- };
-Index: softdevice-cvs-20080922/mpeg2decoder.h
-===================================================================
---- softdevice-cvs-20080922.orig/mpeg2decoder.h
-+++ softdevice-cvs-20080922/mpeg2decoder.h
-@@ -312,7 +312,7 @@ private:
-     bool          packetMode;
- public:
-     int read_packet(uint8_t *buf, int buf_size);
--    int seek(offset_t offset, int whence);
-+    int seek(int64_t offset, int whence);
- 
- public:
-     cMpeg2Decoder(cAudioOut *AudioOut, cVideoOut *VideoOut);
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
deleted file mode 100644
index 0be4aca24359..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.7 2012/05/05 08:27:15 jdhore Exp $
-
-EAPI=3
-
-inherit eutils vdr-plugin versionator
-
-DESCRIPTION="VDR Plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-
-# Detect snapshots
-SNAP_V="$(get_version_component_range 4)"
-if [[ "$SNAP_V" ]]; then
-	MY_P="${PN}-cvs-${SNAP_V}"
-	S="${WORKDIR}/${MY_P#vdr-}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+xv fbcon directfb mmx mmxext xinerama"
-
-RDEPEND=">=media-video/vdr-1.3.36
-	>=virtual/ffmpeg-0.4.9_pre1
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${RDEPEND}
-	xv? ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-	fbcon? ( sys-kernel/linux-headers )
-	virtual/pkgconfig"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
-	"${FILESDIR}/${P}-offsett.patch" )
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use xv && ! use fbcon && ! use directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			elog "SHM does only support xv at the moment"
-		fi
-	else
-		elog "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	elog "SHM support will not be compiled." ;;
-		1)	elog "SHM support will be compiled." ;;
-	esac
-
-	# Check for ffmpeg relying on libtheora without pkg-config-file
-	# Bug #142250
-	if has_version virtual/ffmpeg[theora] && \
-		has_version "<media-libs/libtheora-1.0_alpha4"; then
-
-			eerror "This package will not work when using ffmpeg with"
-			eerror "USE=\"theora\" combined with media-libs/libtheora"
-			eerror "older than version 1.0_alpha4."
-			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
-			die "Please update to at least media-libs/libtheora-1.0_alpha4."
-	fi
-}
-
-src_configure() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-	if use !mmx && use !mmxext; then
-		ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
-		ewarn 'Please enable at least one of these two use-flags.'
-		die "${PN}"' does not compile with USE="-mmx -mmxext".'
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
deleted file mode 100644
index db9c1cf9888d..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.6 2012/05/05 08:27:15 jdhore Exp $
-
-EAPI=3
-
-inherit eutils vdr-plugin versionator
-
-DESCRIPTION="VDR Plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-
-# Detect snapshots
-SNAP_V="$(get_version_component_range 4)"
-if [[ "$SNAP_V" ]]; then
-	MY_P="${PN}-cvs-${SNAP_V}"
-	S="${WORKDIR}/${MY_P#vdr-}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+xv fbcon directfb mmx mmxext xinerama"
-
-RDEPEND=">=media-video/vdr-1.3.36
-	>=virtual/ffmpeg-0.4.9_pre1
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${RDEPEND}
-	xv? ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-	fbcon? ( sys-kernel/linux-headers )
-	virtual/pkgconfig"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff")
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use xv && ! use fbcon && ! use directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			elog "SHM does only support xv at the moment"
-		fi
-	else
-		elog "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	elog "SHM support will not be compiled." ;;
-		1)	elog "SHM support will be compiled." ;;
-	esac
-
-	# Check for ffmpeg relying on libtheora without pkg-config-file
-	# Bug #142250
-	if has_version virtual/ffmpeg[theora] && \
-		has_version "<media-libs/libtheora-1.0_alpha4"; then
-
-			eerror "This package will not work when using ffmpeg with"
-			eerror "USE=\"theora\" combined with media-libs/libtheora"
-			eerror "older than version 1.0_alpha4."
-			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
-			die "Please update to at least media-libs/libtheora-1.0_alpha4."
-	fi
-}
-
-src_configure() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
deleted file mode 100644
index eefc09188ae4..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.5 2012/05/05 08:27:15 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils vdr-plugin versionator
-
-DESCRIPTION="VDR Plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-
-# Detect snapshots
-SNAP_V="$(get_version_component_range 4)"
-if [[ "$SNAP_V" ]]; then
-	MY_P="${PN}-cvs-${SNAP_V}"
-	S="${WORKDIR}/${MY_P#vdr-}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+xv fbcon directfb mmx mmxext xinerama"
-
-# converted from built_with_use that had this comment:
-# Check for ffmpeg relying on libtheora without pkg-config-file
-# Bug #142250
-RDEPEND=">=media-video/vdr-1.3.36
-	|| (
-		>=virtual/ffmpeg-0.4.9_pre1[-theora]
-		(
-			>=virtual/ffmpeg-0.4.9_pre1[theora]
-			>=media-libs/libtheora-1.0_alpha4
-		)
-	)
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${RDEPEND}
-	xv? ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-	fbcon? ( sys-kernel/linux-headers )
-	virtual/pkgconfig"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff")
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use xv && ! use fbcon && ! use directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			elog "SHM does only support xv at the moment"
-		fi
-	else
-		elog "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	elog "SHM support will not be compiled." ;;
-		1)	elog "SHM support will be compiled." ;;
-	esac
-}
-
-src_configure() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}