old, incompatible with stable ffmpeg

(Portage version: 2.1.6.1/cvs/Linux 2.6.27.7 i686)

14 files changed, 2 insertions, 1043 deletions

diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 05ed27a79ad6..19e15686a24f 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -1,36 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d4504300662d6a00324091c5d2e22f9f1feb2 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e
 AUX patches-0.4.0/new-ffmpeg-extern-c.diff 1526 RMD160 ff074327176d72b3e65b7f5f61c615c196d95d6d SHA1 0293a877b0c03012be2e246e1f91fd06c1cb17ec SHA256 4840b91d58672a9f98a04d84fa68e5e74baab9728f31907ab47a55cdfd9d06b0
-AUX patches-0.4.0/series 76 RMD160 01bec4d6bd0cb5f0d7b357cbd316ee7809b65162 SHA1 8b5e5e9bb9679308a4ecfeba1d4e2456d9c27758 SHA256 c3e0c3e9bd003abfea03fff629e339c95a9bd3a9ddeb1e29a6fbacd532c5b1ed
+AUX patches-0.4.0/series 55 RMD160 8474e73a6bf8d9681cca30957aa43d11609c3980 SHA1 97517ffd8b8d4b23498ddb53c547444f17b0abed SHA256 34c9603502734813edd0ffb5d9700b14026850564bcf18088e9870151d662591
 AUX patches-0.4.0/shm-fullscreen-parameter.diff 737 RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea SHA1 93da236176add5a323737ea845054f2964188451 SHA256 2665dd3d2e6059ec61ad8707af7f2b532485d49c8771f5875e0343a7325b48eb
-AUX patches-0.4.0/shm-init-setupStore.diff 1241 RMD160 887c2173a3ce9bae7fb50d0715f7934264dd7c68 SHA1 b11a9ed2e52bbc69c9213009a796f5694240c42f SHA256 228f11c303981d02e1ea31d4d1bc2d74245f7a361bb6c15e25f578e415fab385
-AUX patches-0.4.0/stream-repacker.diff 2440 RMD160 0e0e7ffbf31f1b28918d623315f5a110a4025977 SHA1 2b4a7810b93240b5121c843d80d66572a7ff6d1b SHA256 2f2b86f7b0a1abcf3b8639a3b23fcf8450ca0b16928e9e069b3857004d1bff21
 AUX rc-addon.sh 321 RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 SHA1 02c5f2efad7a8a3a687d79dee998a3fffb0018ea SHA256 d6eaa97c313fca31920f7bcc6d060c3dac9c4ee2624bfff4b0c59fa4ff91153d
-AUX vdr-softdevice-0.2.3-shm-fullscreen.diff 826 RMD160 d1ad20ec5c3d4c8e9e20270f205f09cd984b71a9 SHA1 5caf77a611c3c451416aa7b039ba5d78d8cda261 SHA256 911c00fd9c088a3186059c2b757ea3620dcd27dc20ee842ce326d1970704dfd3
-AUX vdr-softdevice-0.3.1-osdmode-software-default.diff 537 RMD160 b6266883351086f04ff65ff8b3253b0d7c2d9bbf SHA1 c047edc3b3d4f65d9e3a47e2259ccbf2aba63d52 SHA256 e9203e71ca046db87c710a1f51ec4825032a3e0214cd91b2fa96ba6790beddaa
-AUX vdr-softdevice-0.4.0-xinerama-configure-opts.patch 787 RMD160 13bfd161b68372ccc3a5ea3b777d0d5e4a59da9f SHA1 ab65432f810ddd2fa3b9251f5a565c7937fc0be1 SHA256 541d3ff037d2c8ebcfca5873d551ff91e2618e8d551317a0497b6138c8b8af1d
 AUX vdr-softdevice-0.5.0.20080922-offsett.patch 1298 RMD160 ac28491ce13a8d06dc8bd5af6805a4fcd91c9cfd SHA1 5a8ae7cf83c737077b85213f9cfc1b789c9c028c SHA256 ccf16a8e94b6b9a0cb284b1e11595858b330f1307b2157eb1224db6b91e78661
-AUX vdr-softdevice-20070711-vdr-1.5.9.diff 1902 RMD160 0f92a226eb7c176bd799bbbf933a657c5e3a1222 SHA1 0679b5738f3680f51f4081c5a4189a7753ae2d17 SHA256 d4380a425d79068f50b9acf81c7c1e187274b405e1c8f43cba3fafbb2d159027
-DIST vdr-softdevice-0.4.0.tgz 190505 RMD160 78c49568776b71d3b892de8cdc7406f31fd90115 SHA1 0949d6727011ebd0ed0947d9906d081bbe4d2162 SHA256 4a43426e03a36771bce272123d2b3a0a7dc5aac05b98277a985ba277e3c0b9c9
-DIST vdr-softdevice-0.5.0.tgz 200049 RMD160 de854f35173e0ecea21ce73613b5f6e58293d9fa SHA1 e92ef0d6bf71ea6a2c7e2c84dfef07a1c3e81708 SHA256 8b1eec4f5b7cd9a051439830408c1209d5583a5979551b28b69649f1e3381bc3
-DIST vdr-softdevice-cvs-20070711.tar.bz2 152000 RMD160 23be2f95bbb3e4d649a3ade799c443c579f80b84 SHA1 07ee85a8168bea9a9aace5018910f9672802dfb6 SHA256 6c869ae0c86fe42a24f767c40f538d07f70806474d7851643870b3a778b68c1a
-DIST vdr-softdevice-cvs-20080120.tar.bz2 154349 RMD160 0b9b69aafb5855757c199e04852ccde5a7c43529 SHA1 aff47780abc6e2ff3093e4c165ee525f10306e39 SHA256 267c7ded33944902f495012de04020ee6df209e661cba9e640a36460f6b6ca73
 DIST vdr-softdevice-cvs-20080922.tar.bz2 161453 RMD160 8640c1f3aaf8b0edc994247382bfbf390e514fad SHA1 6d87279fe51a04cff50b949daf32d744ca72efc4 SHA256 95588510261069c3d71f466350bb8eee524d70f2b84ba5120745f01b011c8de5
-EBUILD vdr-softdevice-0.4.0.20070711-r1.ebuild 3806 RMD160 c64b0364984fbcfe0a8673c151317f937638df7a SHA1 f9b7d718d3da2cac59fc687a9368a6fdf4506dcf SHA256 75d93902818438cae5fb99d76234135559c34519dd27e2d9db2df27ab7741131
-EBUILD vdr-softdevice-0.4.0.20070711.ebuild 3550 RMD160 79275bd9563266fed3191e2253b9091f3dec6970 SHA1 056e08aba8447f079cb4f10882bf8ecbcbac6893 SHA256 f8a1331d77c6246905315100f58f7762610158791f0edf1942e9a826c660f8d1
-EBUILD vdr-softdevice-0.4.0.20080120.ebuild 3546 RMD160 63faac2aa9c025c1ffa85d4fe0c6633a3abba606 SHA1 ebf2b63eaa67a5c2dd49528ca80e799b0b7a32a0 SHA256 56bd4911043de6c648db4371f91d1d4a9d0478cf7fbea1c660bab66a7783584d
-EBUILD vdr-softdevice-0.4.0.ebuild 3588 RMD160 12d960454ed4cd5a295ef4cab66621d5da3b947d SHA1 181412532815c11aa305de573725ee94076ba468 SHA256 85cde41dd65b8d4d4b7c227651a0294c6ed9be9ffbcbe93ca2426d18a28e421b
-EBUILD vdr-softdevice-0.5.0-r1.ebuild 3571 RMD160 7777c4adad624dcc42b99b906bcd8e902bc85791 SHA1 35c05c982c2abb179478c4ecac8d7d9abe2da0c3 SHA256 63566dd9be19cfe87c5d1b4b8aaf1ff3591d117629b48e5262e40db781641831
 EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3554 RMD160 b46e53927c3b94c85fc4559f8c82759845ad4b2f SHA1 891cfc234d3e46e5d162f3c5e908927c921625f1 SHA256 e7c5e43b66ecb4b002eda6abdbe233b19e923b07a123c53291d71a1e17d97526
-EBUILD vdr-softdevice-0.5.0.ebuild 3487 RMD160 3b61c650f425dcb50697fcabaedd43f9d135b94e SHA1 1a4bdfc8070018d76f96b13e37475ac4345c5975 SHA256 caae055cbcfdc31391ec1014ca54b9ee6224bb13bfd2f34071c917c8179a66c6
 MISC ChangeLog 13865 RMD160 779e2b4e1ae9862f747e737bd3280da5adabe645 SHA1 62a366054abdaf1ce452b5caaae8b4a9ac1a3625 SHA256 615f26d08b1e79c514bef41216cf0a52391749f4ae0cd97ac917511cfc4ff27e
 MISC metadata.xml 315 RMD160 9ff61fc577af435ee1e4c8cc622a7495ee2b6932 SHA1 514ba8e35690751b2d1d8cfba2c4162152f07d0f SHA256 0e99bf3f1538b2fef87bd304d896b78a5ddfb8a75277550c261801dcd3c4e279
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkVwjIACgkQt2vP6XvVdOfLxgCfVGtoqUOa26Zobcm2eYDkqQEM
-UBMAmQHqOhUfIxCBghv1Ro9TygwDwg8I
-=ef47
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
index 4feeaefd5db2..3e52f157fc9e 100644
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/series
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
@@ -1,3 +1,2 @@
+new-ffmpeg-extern-c.diff
 shm-fullscreen-parameter.diff
-shm-init-setupStore.diff
-stream-repacker.diff
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-init-setupStore.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-init-setupStore.diff
deleted file mode 100644
index 2ec7f2ab70b6..000000000000
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/shm-init-setupStore.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: softdevice-cvs/setup-softdevice.h
-===================================================================
---- softdevice-cvs.orig/setup-softdevice.h
-+++ softdevice-cvs/setup-softdevice.h
-@@ -175,6 +175,8 @@ struct cSetupStore {
-           setSourceRectangleLocked;
-     char  alsaDevice [ALSA_DEVICE_NAME_LENGTH];
-     char  alsaAC3Device [ALSA_DEVICE_NAME_LENGTH];
-+
-+    int   setupStoreShmid;
- };
- 
- #define OSDMODE_PSEUDO    0
-Index: softdevice-cvs/softdevice.c
-===================================================================
---- softdevice-cvs.orig/softdevice.c
-+++ softdevice-cvs/softdevice.c
-@@ -850,6 +850,7 @@ cPluginSoftDevice::cPluginSoftDevice(voi
-           ctl=NULL;
-   };
-   setupStore->InitSetupStore();
-+  setupStore->setupStoreShmid = setupStoreShmId;
- #endif
- }
- 
-Index: softdevice-cvs/video-shm.c
-===================================================================
---- softdevice-cvs.orig/video-shm.c
-+++ softdevice-cvs/video-shm.c
-@@ -91,6 +91,7 @@ cShmVideoOut::cShmVideoOut(cSetupStore *
-                 ctl->pict_shmid=-1;
-                 ctl->osd_shmid=-1;
-                 ctl->attached = 0;
-+                ctl->setup_shmid = setupStore->setupStoreShmid;
-         };
- 
-         if ( ctl->semid == -1 ) {
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff
deleted file mode 100644
index cec716a4336c..000000000000
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: softdevice-cvs/mpeg2decoder.c
-===================================================================
---- softdevice-cvs.orig/mpeg2decoder.c
-+++ softdevice-cvs/mpeg2decoder.c
-@@ -174,7 +174,7 @@ void cStreamDecoder::Action()
-   freezeMode=false;
-   AVPacket *pkt;
- 
--  while ( PacketQueue.Available() < 7 && active) {
-+  while ( PacketQueue.Available() < 3 && active) {
-     BUFDEB("wait while loop packets %d StreamDecoder  pid:%d type %d\n",
-       PacketQueue.Available(),getpid(),context->codec_type );
-     usleep(10000);
-@@ -1124,20 +1124,31 @@ void cMpeg2Decoder::Action()
-           usleep(50000);
- 
-         BUFDEB("av_read_frame start\n");
--        //ret = av_read_frame(ic, &pkt);
--        ret = av_read_packet(ic, &pkt);
-+        ret = av_read_frame(ic, &pkt);
-+        //ret = av_read_packet(ic, &pkt);
-         if (ret < 0) {
-             BUFDEB("cMpeg2Decoder Stream Error!\n");
-             if (ThreadActive)
- 		    usleep(10000);
-             continue;
-         }
--        //av_dup_packet(&pkt);
-+        av_dup_packet(&pkt);
-         PacketCount++;
-         BUFDEB("got packet from av_read_frame!\n");
- 
-+#if LIBAVFORMAT_BUILD > 4623
-+        AVRational time_base;
-+        time_base=ic->streams[pkt.stream_index]->time_base;
-+        if ( pkt.pts != (int64_t) AV_NOPTS_VALUE ) {
-+                pkt.pts=av_rescale(pkt.pts, AV_TIME_BASE* (int64_t)time_base.num, time_base.den)/100 ;
-+        };
-+
-+        //printf("PTS: %lld new %lld num %d den %d\n",PTS,pkt.pts,
-+        //                time_base.num,time_base.den);
-+#else
-         if ( pkt.pts != (int64_t) AV_NOPTS_VALUE )
-           pkt.pts/=9;
-+#endif
- 
-         QueuePacket(ic,pkt,packetMode);
- 
-@@ -1193,9 +1204,6 @@ void cMpeg2Decoder::ResetDecoder(int Str
- void cMpeg2Decoder::QueuePacket(const AVFormatContext *ic, AVPacket &pkt,
- 		bool PacketMode)
- {
--  BUFDEB("QueuePacket AudioIdx: %d VideoIdx %d pkt.stream_index: %d\n",
--    AudioIdx,VideoIdx,pkt.stream_index);
--
-   if (!ic) {
-         fprintf(stderr,"Error: ic is null!\n");
-         av_free_packet(&pkt);
-@@ -1221,6 +1229,8 @@ void cMpeg2Decoder::QueuePacket(const AV
-           BUFDEB("Unknown packet type! Return;\n");
-           return;
-   };
-+  BUFDEB("QueuePacket AudioIdx: %d VideoIdx %d pkt.stream_index: %d, packet_type: %d\n",
-+    AudioIdx,VideoIdx,pkt.stream_index,packet_type);
- 
-   // check if there are new streams
-   if ( AudioIdx != DONT_PLAY && packet_type == CODEC_TYPE_AUDIO
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-fullscreen.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-fullscreen.diff
deleted file mode 100644
index e3c13cca03aa..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-fullscreen.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru softdevice-0.2.3.cvs/ShmClient.c softdevice-0.2.3.cvs-shm-fullscreen/ShmClient.c
---- softdevice-0.2.3.cvs/ShmClient.c	2006-05-14 21:56:07.000000000 +0200
-+++ softdevice-0.2.3.cvs-shm-fullscreen/ShmClient.c	2006-05-29 21:33:21.000000000 +0200
-@@ -67,6 +67,16 @@
- int main(int argc, char **argv) {
-         cSetupStore SetupStore;
-         SetupStore.xvFullscreen=0;
-+	if (argc>1) {
-+		if (strcmp(argv[1], "-f") == 0) {
-+			SetupStore.xvFullscreen=1;
-+		} else if (strcmp(argv[1], "-h") == 0) {
-+			printf ("Shared-Memory-Client for vdr-softdevice\n");
-+			printf ("Options:\n");
-+			printf ("  -f   Start fullscreen\n");
-+			return 0;
-+		}
-+	}
-         cXvVideoOut *vout=new cXvVideoOut(&SetupStore);
-         xvRemote= new cShmRemote("softdevice-xv");
- 
-Nur in softdevice-0.2.3.cvs-shm-fullscreen/: .ShmClient.c.swp.
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.1-osdmode-software-default.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.1-osdmode-software-default.diff
deleted file mode 100644
index 45503a04c957..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.3.1-osdmode-software-default.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru softdevice-0.3.1-orig/setup-softdevice.c softdevice-0.3.1/setup-softdevice.c
---- softdevice-0.3.1-orig/setup-softdevice.c	2006-11-09 14:43:21.841179646 +0100
-+++ softdevice-0.3.1/setup-softdevice.c	2006-11-09 14:43:28.846888627 +0100
-@@ -123,6 +123,7 @@
-   syncTimerMode = 2;
-   vidCaps = 0;
-   vidBrightness = vidHue = vidContrast = vidSaturation = -1;
-+  osdMode = 1;
- 
-   /* --------------------------------------------------------------------------
-    * these screen width/height values are operating in square pixel mode.
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch
deleted file mode 100644
index d9e735bf1c00..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.4.0-xinerama-configure-opts.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru softdevice-0.4.0-orig/configure softdevice-0.4.0/configure
---- softdevice-0.4.0-orig/configure	2007-04-11 17:30:54.486914045 +0200
-+++ softdevice-0.4.0/configure	2007-04-11 17:31:38.619850758 +0200
-@@ -59,6 +59,7 @@
-   echo "  --disable-mmx"
-   echo "  --disable-mmx2"
-   echo "  --disable-alsa"
-+  echo "  --disable-xinerama"
-   echo "  --disable-oss"
-   echo "  --disable-suspendkey"
-   echo "  --disable-yaepg / --enable-yapg (yaepg patch support)"
-@@ -83,6 +84,7 @@
-     --disable-mmx) shift; with_mmx="no";;
-     --disable-mmx2) shift; with_mmx2="no";;
-     --disable-alsa) shift; alsa="no";;
-+    --disable-xinerama) shift; xinerama="no";;
-     --disable-oss) shift; oss="no";;
-     --disable-suspendkey) shift; suspendkey="no";;
-     --disable-yaepg) shift; yaepg="no";;
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff
deleted file mode 100644
index 73f22ebedbe3..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru softdevice.cvs.orig/softdevice.c softdevice.cvs/softdevice.c
---- softdevice.cvs.orig/softdevice.c	2007-07-24 04:10:13.000000000 -0700
-+++ softdevice.cvs/softdevice.c	2007-08-26 18:06:33.000000000 -0700
-@@ -119,7 +119,7 @@
-     static cOsd *osd;
- public:
-     cSoftOsdProvider(cVideoOut *VideoOut);
--    virtual cOsd *CreateOsd(int Left, int Top);
-+    virtual cOsd *CreateOsd(int Left, int Top, uint Level);
-     static cOsd *GetOsd();
- };
- 
-@@ -130,9 +130,9 @@
-     videoOut = VideoOut;
- }
- 
--cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top)
-+cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top, uint Level)
- {
--    osd = new cSoftOsd(videoOut, Left, Top);
-+    osd = new cSoftOsd(videoOut, Left, Top, Level);
-     return osd;
- }
- 
-diff -ru softdevice.cvs.orig/SoftOsd.c softdevice.cvs/SoftOsd.c
---- softdevice.cvs.orig/SoftOsd.c	2007-07-24 04:10:11.000000000 -0700
-+++ softdevice.cvs/SoftOsd.c	2007-08-26 18:14:57.000000000 -0700
-@@ -46,8 +46,8 @@
- /* ---------------------------------------------------------------------------
-  */
- 
--cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y)
--        : cOsd(X, Y),active(false),close(false) {
-+cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y, uint level)
-+        : cOsd(X, Y, 0),active(false),close(false) {
-         OSDDEB("cSoftOsd constructor\n");
-         OutputConvert=&cSoftOsd::ARGB_to_ARGB32;
-         bitmap_Format=PF_None; // forces a clear after first SetMode
-diff -ru softdevice.cvs.orig/SoftOsd.h softdevice.cvs/SoftOsd.h
---- softdevice.cvs.orig/SoftOsd.h	2007-07-24 04:10:11.000000000 -0700
-+++ softdevice.cvs/SoftOsd.h	2007-08-26 18:13:17.000000000 -0700
-@@ -91,7 +91,7 @@
-     int ScreenOsdWidth;
-     int ScreenOsdHeight;
- public:
--    cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs);
-+    cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs, uint level);
-     virtual ~cSoftOsd();
-     virtual void Flush(void);
- 
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
deleted file mode 100644
index e106ad7b8471..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
+++ /dev/null
@@ -1,144 +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-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild,v 1.6 2008/04/24 19:21:52 zzam Exp $
-
-inherit 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
-			http://dev.gentoo.org/~zzam/distfiles/${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
-	>=media-video/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 )
-	dev-util/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}/patches-0.4.0/shm-init-setupStore.diff"
-	"${FILESDIR}/patches-0.4.0/stream-repacker.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 built_with_use media-video/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_unpack() {
-	vdr-plugin_src_unpack unpack
-	cd "${S}"
-
-	if has_version ">=media-video/vdr-1.5.9"; then
-		epatch "${FILESDIR}"/${PN}-${SNAP_V}-vdr-1.5.9.diff
-	fi
-	vdr-plugin_src_unpack all_but_unpack
-}
-
-src_compile() {
-	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"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-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
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
deleted file mode 100644
index 4be132402636..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711.ebuild
+++ /dev/null
@@ -1,133 +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-softdevice/vdr-softdevice-0.4.0.20070711.ebuild,v 1.5 2008/04/24 19:21:52 zzam Exp $
-
-inherit 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
-			http://dev.gentoo.org/~zzam/distfiles/${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
-	>=media-video/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 )
-	dev-util/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}/patches-0.4.0/shm-init-setupStore.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 built_with_use media-video/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_compile() {
-	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"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-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
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild
deleted file mode 100644
index f213b0d4e1c3..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20080120.ebuild
+++ /dev/null
@@ -1,133 +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-softdevice/vdr-softdevice-0.4.0.20080120.ebuild,v 1.3 2008/04/24 19:21:52 zzam Exp $
-
-inherit 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
-			http://dev.gentoo.org/~zzam/distfiles/${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
-	>=media-video/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 )
-	dev-util/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}/patches-0.4.0/stream-repacker.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 built_with_use media-video/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_compile() {
-	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"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-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
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
deleted file mode 100644
index b5d8439b07f0..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.ebuild
+++ /dev/null
@@ -1,134 +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-softdevice/vdr-softdevice-0.4.0.ebuild,v 1.7 2008/04/24 19:21:52 zzam Exp $
-
-inherit 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
-			http://dev.gentoo.org/~zzam/distfiles/${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
-	>=media-video/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 )
-	dev-util/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}/${PN}-0.2.3-shm-fullscreen.diff"
-	"${FILESDIR}/${PN}-0.4.0-xinerama-configure-opts.patch"
-	"${FILESDIR}/${PN}-0.3.1-osdmode-software-default.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 built_with_use media-video/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_compile() {
-	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"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-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
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0-r1.ebuild
deleted file mode 100644
index f3b0487ff170..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,133 +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-softdevice/vdr-softdevice-0.5.0-r1.ebuild,v 1.1 2008/04/24 19:21:52 zzam Exp $
-
-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
-			http://dev.gentoo.org/~zzam/distfiles/${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
-	>=media-video/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 )
-	dev-util/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 built_with_use media-video/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_compile() {
-	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"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-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
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.ebuild
deleted file mode 100644
index 70a5e5a602f6..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.ebuild
+++ /dev/null
@@ -1,132 +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-softdevice/vdr-softdevice-0.5.0.ebuild,v 1.1 2008/04/18 20:34:54 zzam Exp $
-
-inherit 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
-			http://dev.gentoo.org/~zzam/distfiles/${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
-	>=media-video/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 )
-	dev-util/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 built_with_use media-video/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_compile() {
-	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"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-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
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}