Cleanup of old ebuilds.

Package-Manager: portage-2.1.2_rc1-r1

18 files changed, 7 insertions, 1810 deletions

diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 813f76815bfd..b68b8ece90af 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -9,105 +9,38 @@ AUX rc-addon.sh 529 RMD160 fe223c84fa13a7427b1d64306b0ddc82253abc67 SHA1 052bfe1
 MD5 775393019b942662d3cf11bab316a095 files/rc-addon.sh 529
 RMD160 fe223c84fa13a7427b1d64306b0ddc82253abc67 files/rc-addon.sh 529
 SHA256 343e312d3edee038db1f0b7083599101712a482bab64922b94c580ba6b68391d files/rc-addon.sh 529
-AUX softdevice-cvs-libcle266mpegdec-0.2.patch 2277 RMD160 62de06c05bfe80a22b485b27b87aa4b4afcbbddc SHA1 4b1d515d135f2c627c7e8d67a4cb8763df3cbea3 SHA256 58b61504c609f53eb6782d71a5062b2855273e7beb886f1bbd1d5ec4aa6a2a05
-MD5 bb9daf402c4b7da2326c817331019aa7 files/softdevice-cvs-libcle266mpegdec-0.2.patch 2277
-RMD160 62de06c05bfe80a22b485b27b87aa4b4afcbbddc files/softdevice-cvs-libcle266mpegdec-0.2.patch 2277
-SHA256 58b61504c609f53eb6782d71a5062b2855273e7beb886f1bbd1d5ec4aa6a2a05 files/softdevice-cvs-libcle266mpegdec-0.2.patch 2277
 AUX softdevice-cvs-xinerama-configure-opts.patch 758 RMD160 fe4b6d46d3721bcc8d5332bccb0289ddf9df84e8 SHA1 d7986ae138de94752afec5a76471ffc15cf3f81a SHA256 8eb0467383004b3f43d1e868d78bb76d8c0afc09841edce978d373f65cdc3ad0
 MD5 e8fe69985f1d48b7b62c32c1151912b0 files/softdevice-cvs-xinerama-configure-opts.patch 758
 RMD160 fe4b6d46d3721bcc8d5332bccb0289ddf9df84e8 files/softdevice-cvs-xinerama-configure-opts.patch 758
 SHA256 8eb0467383004b3f43d1e868d78bb76d8c0afc09841edce978d373f65cdc3ad0 files/softdevice-cvs-xinerama-configure-opts.patch 758
-AUX vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306 RMD160 005f050095fc34b172f741fee73a97c5b70d40f5 SHA1 05b6ba545bcf071221f2b16f9ef1ef7e80d49175 SHA256 ca66e41ae3af48b3cd2c08f5347f1fdcc54dc2d8fe87db42af0e05aecc8127e1
-MD5 51f2423448df2efb22656fc55a5138f0 files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306
-RMD160 005f050095fc34b172f741fee73a97c5b70d40f5 files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306
-SHA256 ca66e41ae3af48b3cd2c08f5347f1fdcc54dc2d8fe87db42af0e05aecc8127e1 files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff 5306
-AUX vdr-softdevice-0.2.3-shm-contrast.diff 466 RMD160 09058ab3a04eb8d69c8bbfe936c4f5bfc2c924f3 SHA1 c4f56d7ab826ab9b76cedd4959921ffdbbfd7fb5 SHA256 d52414ab2236e5c446c9db2d27087189d948ec178e04ecba0b2b1a13432c559a
-MD5 3821a820f06a15e0f9570de3e8236ecd files/vdr-softdevice-0.2.3-shm-contrast.diff 466
-RMD160 09058ab3a04eb8d69c8bbfe936c4f5bfc2c924f3 files/vdr-softdevice-0.2.3-shm-contrast.diff 466
-SHA256 d52414ab2236e5c446c9db2d27087189d948ec178e04ecba0b2b1a13432c559a files/vdr-softdevice-0.2.3-shm-contrast.diff 466
 AUX vdr-softdevice-0.2.3-shm-fullscreen.diff 826 RMD160 d1ad20ec5c3d4c8e9e20270f205f09cd984b71a9 SHA1 5caf77a611c3c451416aa7b039ba5d78d8cda261 SHA256 911c00fd9c088a3186059c2b757ea3620dcd27dc20ee842ce326d1970704dfd3
 MD5 d0ae5751f6fa561827220f66631f3c7b files/vdr-softdevice-0.2.3-shm-fullscreen.diff 826
 RMD160 d1ad20ec5c3d4c8e9e20270f205f09cd984b71a9 files/vdr-softdevice-0.2.3-shm-fullscreen.diff 826
 SHA256 911c00fd9c088a3186059c2b757ea3620dcd27dc20ee842ce326d1970704dfd3 files/vdr-softdevice-0.2.3-shm-fullscreen.diff 826
-AUX vdr-softdevice-0.2.3-shm-key-init.diff 463 RMD160 7e6f0de8b191fc778953a26455b86608b231cd63 SHA1 d0c7e8d69c54acd038643d037e882e10e9182d1f SHA256 5dee8605967fafa4714b5f0f3d93892606c414655249c331df6027e6b3b5fc2c
-MD5 1160a43a1604711610aa7adadf609da0 files/vdr-softdevice-0.2.3-shm-key-init.diff 463
-RMD160 7e6f0de8b191fc778953a26455b86608b231cd63 files/vdr-softdevice-0.2.3-shm-key-init.diff 463
-SHA256 5dee8605967fafa4714b5f0f3d93892606c414655249c331df6027e6b3b5fc2c files/vdr-softdevice-0.2.3-shm-key-init.diff 463
-AUX vdr-softdevice-0.2.3-threading.diff 15880 RMD160 ef9d0a81485a9dd07ceff0bc5d3ffa07d1697009 SHA1 77a98b23f9e8a98f4a71de7645f208bba41e3b67 SHA256 6b13b52822c2d99a1592fb82141dcc5e1b9be94c99dc37d88c6cec251a5cf1be
-MD5 6dc8a6d12ff94b70d07ed50594c10587 files/vdr-softdevice-0.2.3-threading.diff 15880
-RMD160 ef9d0a81485a9dd07ceff0bc5d3ffa07d1697009 files/vdr-softdevice-0.2.3-threading.diff 15880
-SHA256 6b13b52822c2d99a1592fb82141dcc5e1b9be94c99dc37d88c6cec251a5cf1be files/vdr-softdevice-0.2.3-threading.diff 15880
-AUX vdr-softdevice-0.2.3-xv-settings.diff 3160 RMD160 787e9f8b371047ca14269ce70273fe03e17b0787 SHA1 8e887a659f19554434bd99ee87182b7329f69d6c SHA256 b9e4e1983969cd09c7219c4a3c00750c12a116bdb406418beb3e2e7df9e70ab7
-MD5 eaf618bbc005045f78b01b542d792878 files/vdr-softdevice-0.2.3-xv-settings.diff 3160
-RMD160 787e9f8b371047ca14269ce70273fe03e17b0787 files/vdr-softdevice-0.2.3-xv-settings.diff 3160
-SHA256 b9e4e1983969cd09c7219c4a3c00750c12a116bdb406418beb3e2e7df9e70ab7 files/vdr-softdevice-0.2.3-xv-settings.diff 3160
-AUX vdr-softdevice-0.2.3a-CVS-20060511.diff 5732 RMD160 25b8bb29a77ec03de06effcdbf0850e1c3303919 SHA1 8bb680969474fc93cf9f544328b7230f8b459a47 SHA256 c69f0de683ed6d5d0d031fbc86c2a1a3f32a031c5a2b6778ea73d79eca8bd5e7
-MD5 01851b3338d57baa07fcdeff833327f6 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
-RMD160 25b8bb29a77ec03de06effcdbf0850e1c3303919 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
-SHA256 c69f0de683ed6d5d0d031fbc86c2a1a3f32a031c5a2b6778ea73d79eca8bd5e7 files/vdr-softdevice-0.2.3a-CVS-20060511.diff 5732
 AUX vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544 RMD160 8d97ab79bb68f769fc4e3d12003a9e1c7c62777d SHA1 74c8dc2a3aa5f87eb5e701e71a4f168e5d8703b6 SHA256 ad8bdaa4f6a02df39e840b2c18764391c22e66acf68d3cebbc824f365dfc27ce
 MD5 c29be94696c90ea9b6003788a03cbb4c files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544
 RMD160 8d97ab79bb68f769fc4e3d12003a9e1c7c62777d files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544
 SHA256 ad8bdaa4f6a02df39e840b2c18764391c22e66acf68d3cebbc824f365dfc27ce files/vdr-softdevice-0.3.0-YUY2-cut-segfault.diff 1544
-DIST vdr-softdevice-0.2.3a.tgz 133780 RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 SHA1 13f0b16b4bbde1c10b3dc31c075f43e8ca6eeb5d SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92
 DIST vdr-softdevice-0.3.0.tgz 154294 RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe SHA1 89b532c536c450e2eb51fedbf2a0192e0940a179 SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a
-DIST vdr-softdevice-cvs-20060814.tar.bz2 122901 RMD160 d9b010f9d10eb574681cbea2ea433ddd3f5356f7 SHA1 c7fa5c511916995c7661134ef085091892d5ea7a SHA256 476722fe33ff3bb75e7859b93b563d68b098cd78be31fe40044b4d27324e60f4
-DIST vdr-softdevice-cvs-20060908.tar.bz2 124038 RMD160 8991e3e0f4f6ea9a8a0171d19098e064c6584c82 SHA1 98e0443854f8a1612878496bd05a7a9c8c913063 SHA256 f41bfb0dd822ca6c5136fdde842382e72a937bc2acacfeb5430d0e73a5c47f37
-DIST vdr-softdevice-cvs-20060912.tar.bz2 125161 RMD160 467dd24893fa884921c0201dc64375e60f2382b1 SHA1 c985ffdb7e0a44524ab48b2cb1a7fd6704fab8dd SHA256 f4477713914966bbf50854f8c75232ce0ffdb669750c4483ba63521ab05410fd
-EBUILD vdr-softdevice-0.2.3.20060511-r7.ebuild 3098 RMD160 d9733421ea94ec172257737294cf8c6af855ff00 SHA1 2dda664645a4f6c9b9b43cf886d2efc1d8270803 SHA256 9be701e372f6001124721c3b636c53a2d14dd561599641e394b611ab47f06450
-MD5 43a1247255aef5bc32a2eb739657b50e vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
-RMD160 d9733421ea94ec172257737294cf8c6af855ff00 vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
-SHA256 9be701e372f6001124721c3b636c53a2d14dd561599641e394b611ab47f06450 vdr-softdevice-0.2.3.20060511-r7.ebuild 3098
-EBUILD vdr-softdevice-0.2.3.20060814-r1.ebuild 3502 RMD160 52576aa865b28c3b60adbb978fb74e1c7e81d07d SHA1 0f56e6dd6d9de90f4a3bae597e0296d2b36ff6f4 SHA256 06d12a852333194f60533e04b17fa3884142cc846d07a35ec4db1e41b43c493f
-MD5 7ede6415ae6570342b8a05a4b1bf0871 vdr-softdevice-0.2.3.20060814-r1.ebuild 3502
-RMD160 52576aa865b28c3b60adbb978fb74e1c7e81d07d vdr-softdevice-0.2.3.20060814-r1.ebuild 3502
-SHA256 06d12a852333194f60533e04b17fa3884142cc846d07a35ec4db1e41b43c493f vdr-softdevice-0.2.3.20060814-r1.ebuild 3502
-EBUILD vdr-softdevice-0.2.3.20060908.ebuild 3539 RMD160 50529a02b301db556de31000d04439957e0e616b SHA1 c0e4ef76c329da9faaf03c3ce2f015541d85520e SHA256 e762f9892b1105c9c7d67ab4c686fead9e7e997e7f6c0efdefe6646225a7045b
-MD5 d6832ce82d12726443d285589a9c0084 vdr-softdevice-0.2.3.20060908.ebuild 3539
-RMD160 50529a02b301db556de31000d04439957e0e616b vdr-softdevice-0.2.3.20060908.ebuild 3539
-SHA256 e762f9892b1105c9c7d67ab4c686fead9e7e997e7f6c0efdefe6646225a7045b vdr-softdevice-0.2.3.20060908.ebuild 3539
-EBUILD vdr-softdevice-0.2.3.20060912.ebuild 3502 RMD160 839ac96ff984a2f692ba9caaab17f208c2bd52fb SHA1 ca41bffa0d20c00eb96e0caa5db6efde7d463b1b SHA256 d62ac03e91b4cdaa0366a2aac1bf57d7cc28432bae4690f4c6ef744d21800d9e
-MD5 bac637bac289d5aeb8be2de5ca6de9e9 vdr-softdevice-0.2.3.20060912.ebuild 3502
-RMD160 839ac96ff984a2f692ba9caaab17f208c2bd52fb vdr-softdevice-0.2.3.20060912.ebuild 3502
-SHA256 d62ac03e91b4cdaa0366a2aac1bf57d7cc28432bae4690f4c6ef744d21800d9e vdr-softdevice-0.2.3.20060912.ebuild 3502
 EBUILD vdr-softdevice-0.3.0-r1.ebuild 3367 RMD160 b6fbde42a764a98720cc3143cdbef20828018e10 SHA1 5afb0121621e61e8656561b9dd18f3e47534edd2 SHA256 4ec3f4d4d32193a14efc9076104f1baca7a411602948c5a6134396214cfd1a32
 MD5 5689a941854220582d18c14aa1ce43cb vdr-softdevice-0.3.0-r1.ebuild 3367
 RMD160 b6fbde42a764a98720cc3143cdbef20828018e10 vdr-softdevice-0.3.0-r1.ebuild 3367
 SHA256 4ec3f4d4d32193a14efc9076104f1baca7a411602948c5a6134396214cfd1a32 vdr-softdevice-0.3.0-r1.ebuild 3367
-EBUILD vdr-softdevice-0.3.0.ebuild 3306 RMD160 ee2a56ab3993ca9ed41fdb33d025c428157b0b76 SHA1 cd29a9d03c14f8a7c9fd229fb029b7a951f72ccb SHA256 7abe90fa9858fc658412306d8e26eb532de2b548cef89a818bb9c258128e406b
-MD5 88918c0c7cb96bb624dc453876bb0496 vdr-softdevice-0.3.0.ebuild 3306
-RMD160 ee2a56ab3993ca9ed41fdb33d025c428157b0b76 vdr-softdevice-0.3.0.ebuild 3306
-SHA256 7abe90fa9858fc658412306d8e26eb532de2b548cef89a818bb9c258128e406b vdr-softdevice-0.3.0.ebuild 3306
-MISC ChangeLog 5544 RMD160 7b691fe29f14f2b8a669a423bd5b5aff90aac361 SHA1 da6e2da6e13a800aa89e36720fe385cc2ec97bf6 SHA256 02feaa39baf4a06c20fb6e4173dbec40a6ca8240b6e1605a49469ca08b25fe14
-MD5 98096543475141aab207cc11d0b92e00 ChangeLog 5544
-RMD160 7b691fe29f14f2b8a669a423bd5b5aff90aac361 ChangeLog 5544
-SHA256 02feaa39baf4a06c20fb6e4173dbec40a6ca8240b6e1605a49469ca08b25fe14 ChangeLog 5544
+MISC ChangeLog 6184 RMD160 434048238a52e27ec24a2bac029b640b1739cca8 SHA1 a92ae179b11e055eedda75e8ce63e12cf3ce7d1a SHA256 5523abee69aa1b7019b9d9ccc64db484d53a57bb2efb27a2114b1634a35f5d89
+MD5 7e4e365cadf6ed853e2dc21ab3bf98f5 ChangeLog 6184
+RMD160 434048238a52e27ec24a2bac029b640b1739cca8 ChangeLog 6184
+SHA256 5523abee69aa1b7019b9d9ccc64db484d53a57bb2efb27a2114b1634a35f5d89 ChangeLog 6184
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata.xml 298
-MD5 c7a0fabecfebf2988f2c1552b361c1ae files/digest-vdr-softdevice-0.2.3.20060511-r7 256
-RMD160 498e786a7b8110e307aa41c04ed04d88aade4653 files/digest-vdr-softdevice-0.2.3.20060511-r7 256
-SHA256 5d9d302686e0c254357af9482fb419c4510e73882e820f3bfcf76387d49be011 files/digest-vdr-softdevice-0.2.3.20060511-r7 256
-MD5 2fed7fd9a2a77ab1a608e5215a0c25d3 files/digest-vdr-softdevice-0.2.3.20060814-r1 286
-RMD160 5e763b40d209c8a319dc776f174b07a84dc4f375 files/digest-vdr-softdevice-0.2.3.20060814-r1 286
-SHA256 8b86ceef4b53dc1cfc1b5d595124a672bc98f5da8c14227241d905ab41581b42 files/digest-vdr-softdevice-0.2.3.20060814-r1 286
-MD5 01d84406d1b0b0afddfa88deb70f166a files/digest-vdr-softdevice-0.2.3.20060908 286
-RMD160 74cd1ce3c5336ac2d51b68f8a2af7fbd3654b5e2 files/digest-vdr-softdevice-0.2.3.20060908 286
-SHA256 9bfcf8f5e3979a64a0b76c55f8ea3abd339a8fa7d35e98a316b5f8af1902f0aa files/digest-vdr-softdevice-0.2.3.20060908 286
-MD5 7157de0ad97d3b2d1c0c887fa7cb8a9f files/digest-vdr-softdevice-0.2.3.20060912 286
-RMD160 cade67ed856b48b2dd2900d3326aed92cdca4200 files/digest-vdr-softdevice-0.2.3.20060912 286
-SHA256 72b63ba65244177985c6511baca48471cf48412d196441d9a8e354bc67ee7374 files/digest-vdr-softdevice-0.2.3.20060912 286
-MD5 1a99e63b0950911ea31f51ca8a438eb1 files/digest-vdr-softdevice-0.3.0 253
-RMD160 2f9b5df740163dbee55f753866ca320381b1f123 files/digest-vdr-softdevice-0.3.0 253
-SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/digest-vdr-softdevice-0.3.0 253
 MD5 1a99e63b0950911ea31f51ca8a438eb1 files/digest-vdr-softdevice-0.3.0-r1 253
 RMD160 2f9b5df740163dbee55f753866ca320381b1f123 files/digest-vdr-softdevice-0.3.0-r1 253
 SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/digest-vdr-softdevice-0.3.0-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOnBit2vP6XvVdOcRArm6AJ4s5rdTOFNpUBj5XqSKH1F58HvpywCgqsxd
-UU2AEJDf7/Ru/Od7sbV/gpA=
-=6quE
+iD8DBQFFRfbbt2vP6XvVdOcRApV1AKCQJtmw40LUdnqCNy7MqGgNzYJVWQCgxSyh
+d50CcGMQ0t7QXB/KeS+Qf08=
+=b9y0
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r7 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r7
deleted file mode 100644
index cb395c04db4b..000000000000
--- a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060511-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dfae4ed2ab2bb17572de993461cf36f8 vdr-softdevice-0.2.3a.tgz 133780
-RMD160 d97d7a1bbe4a3b325041bbe0e7ef23740f8121b1 vdr-softdevice-0.2.3a.tgz 133780
-SHA256 bbf05254ce6f0559ce6aeed055272ba6fb207ba443a49926b91506e9de69ab92 vdr-softdevice-0.2.3a.tgz 133780
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060814-r1 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060814-r1
deleted file mode 100644
index 9c81f33962ab..000000000000
--- a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060814-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0737819d11a425aadbbe30d7cdb0c0d7 vdr-softdevice-cvs-20060814.tar.bz2 122901
-RMD160 d9b010f9d10eb574681cbea2ea433ddd3f5356f7 vdr-softdevice-cvs-20060814.tar.bz2 122901
-SHA256 476722fe33ff3bb75e7859b93b563d68b098cd78be31fe40044b4d27324e60f4 vdr-softdevice-cvs-20060814.tar.bz2 122901
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060908 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060908
deleted file mode 100644
index 5eb02ab5dda6..000000000000
--- a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060908
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea2591f80ff5297f46822332cf4e8425 vdr-softdevice-cvs-20060908.tar.bz2 124038
-RMD160 8991e3e0f4f6ea9a8a0171d19098e064c6584c82 vdr-softdevice-cvs-20060908.tar.bz2 124038
-SHA256 f41bfb0dd822ca6c5136fdde842382e72a937bc2acacfeb5430d0e73a5c47f37 vdr-softdevice-cvs-20060908.tar.bz2 124038
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060912 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060912
deleted file mode 100644
index 96257f8a08f8..000000000000
--- a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.2.3.20060912
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52ceac742d5d1d780c77a57173710595 vdr-softdevice-cvs-20060912.tar.bz2 125161
-RMD160 467dd24893fa884921c0201dc64375e60f2382b1 vdr-softdevice-cvs-20060912.tar.bz2 125161
-SHA256 f4477713914966bbf50854f8c75232ce0ffdb669750c4483ba63521ab05410fd vdr-softdevice-cvs-20060912.tar.bz2 125161
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0
deleted file mode 100644
index ac181d951443..000000000000
--- a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0be5f52328bd649a33f31df4cd905455 vdr-softdevice-0.3.0.tgz 154294
-RMD160 fce250ac59e0a4bd3122fbed85bb6d8a6f4c2ebe vdr-softdevice-0.3.0.tgz 154294
-SHA256 2c15bfaf94c07dda3facd3c44219c4d9ebb1199093ec0aa4d35c1d3f67828b8a vdr-softdevice-0.3.0.tgz 154294
diff --git a/media-plugins/vdr-softdevice/files/softdevice-cvs-libcle266mpegdec-0.2.patch b/media-plugins/vdr-softdevice/files/softdevice-cvs-libcle266mpegdec-0.2.patch
deleted file mode 100644
index a003d67567ef..000000000000
--- a/media-plugins/vdr-softdevice/files/softdevice-cvs-libcle266mpegdec-0.2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru softdevice-cvs-20060814/configure softdevice-cvs-20060814-try1/configure
---- softdevice-cvs-20060814/configure	2006-08-14 20:50:22.000000000 +0200
-+++ softdevice-cvs-20060814-try1/configure	2006-08-15 21:40:58.000000000 +0200
-@@ -328,15 +328,17 @@
- #
- if test "${dfb}" = "yes" ; then
-   echo -n "Checking for libcle266mpegdec ... "
--  cle266_cflags=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags libcle266mpegdec 2>>config.log` || cle266="no"
-+  cle266_version=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --modversion libcle266mpegdec 2>>config.log` || cle266="no"
-   if test "${cle266}" = "yes" ; then
-+    cle266_cflags=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags libcle266mpegdec`
-     cle266_libs=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs libcle266mpegdec`
-     cle266_opts="${cle266_cflags} ${cle266_libs}"
-   fi
- 
--  if test "${cle266}" = "yes" ; then
-+  if test "${cle266}" = "yes" && test "${cle266_version}" = "0.2"; then
-     echo "Enabled cle266 hardware decoding."
-   else
-+    cle266="no"
-     echo "Not found."
-   fi
- elsediff -ru softdevice-cvs-20060814/mpeg2decoder.c softdevice-cvs-20060814-try1/mpeg2decoder.c
---- softdevice-cvs-20060814/mpeg2decoder.c	2006-08-14 20:50:22.000000000 +0200
-+++ softdevice-cvs-20060814-try1/mpeg2decoder.c	2006-08-15 21:40:58.000000000 +0200
-@@ -757,7 +757,7 @@
- };
- 
- #ifdef HAVE_CLE266_MPEG_DECODER
--float aspect_ratio_values[5]={1.0, 1.0, 4.0/3.0, 16.0/9.0, 221.0/110 };
-+float aspect_ratio_values[5]={1.0, 1.0, 4.0/3.0, 16.0/9.0, 2.21 };
- 
- int cVideoStreamDecoder::DecodePicture_cle266(sPicBuffer *&pic, 
-                 int &got_picture,uint8_t *data, int length, int64_t pkt_pts) {
-@@ -790,9 +790,9 @@
-   pic->width = decoder.width;
-   pic->height = decoder.height;
-   pic->pts = pkt_pts;
--  pic->edge_width=pic->edge_height=0;
--  pic->dtg_active_format = 0; // currently not parsed
--  pic->interlaced_frame = true; // FIXME Do we have that information?
-+  pic->edge_width = pic->edge_height = 0;
-+  pic->dtg_active_format = decoder.dtg_active_format;
-+  pic->interlaced_frame = decoder.progressive_sequence ? false : true;
-   pic->aspect_ratio = ( decoder.aspect_ratio_info >= 0 
-     && decoder.aspect_ratio_info < 5 ) ?
-     aspect_ratio_values[decoder.aspect_ratio_info] : 1.0;
-
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff
deleted file mode 100644
index 9221abe1b61f..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-picture-settings-use-defaults.diff
+++ /dev/null
@@ -1,141 +0,0 @@
-Index: setup-softdevice.c
-===================================================================
-RCS file: /cvsroot/softdevice/softdevice/setup-softdevice.c,v
-retrieving revision 1.45
-diff -u -r1.45 setup-softdevice.c
---- setup-softdevice.c	25 Jun 2006 13:46:12 -0000	1.45
-+++ setup-softdevice.c	16 Jul 2006 19:48:50 -0000
-@@ -91,6 +91,8 @@
- {
-   xvAspect      = 1;   // XV_FORMAT_NORMAL;
-   xvMaxArea     = 0;
-+  xvFullscreen  = 0;
-+  xvUseDefaults = 0;
-   outputMethod  = 0;
-   cropMode      = 0;
-   cropModeToggleKey = 0;
-Index: setup-softdevice.h
-===================================================================
-RCS file: /cvsroot/softdevice/softdevice/setup-softdevice.h,v
-retrieving revision 1.32
-diff -u -r1.32 setup-softdevice.h
---- setup-softdevice.h	25 Jun 2006 13:46:12 -0000	1.32
-+++ setup-softdevice.h	16 Jul 2006 19:48:51 -0000
-@@ -125,6 +125,7 @@
-     int   xvAspect;
-     int   xvMaxArea;
-     int   xvFullscreen;
-+    int   xvUseDefaults;
-     int   outputMethod;
-     int   pixelFormat;
-     bool  pixelFormatLocked;
-Index: softdevice.c
-===================================================================
-RCS file: /cvsroot/softdevice/softdevice/softdevice.c,v
-retrieving revision 1.64
-diff -u -r1.64 softdevice.c
---- softdevice.c	11 Jul 2006 20:31:37 -0000	1.64
-+++ softdevice.c	16 Jul 2006 19:48:52 -0000
-@@ -368,6 +368,8 @@
-   {
-     esyslog("[softdevice] could not load (%s)[%s] exiting\n",
-             subPluginFileName, err);
-+    fprintf(stderr,"[softdevice] could not load (%s)[%s] exiting\n",
-+            subPluginFileName, err);
-     exit(1);
-   }
- }
-@@ -705,6 +707,7 @@
-   "  -vo xv:aspect=normal     use a  4:3 display area (768x576)\n"
-   "  -vo xv:max-area          use maximum available area\n"
-   "  -vo xv:full              startup fullscreen\n"
-+  "  -vo xv:use-defaults      don't change brigtness etc on startup\n"
- #endif
- #ifdef FB_SUPPORT
-   "  -vo fb:                  enable output via framebuffer\n"
-@@ -782,6 +785,11 @@
-               fprintf (stderr,
-                        "[ProcessArgs] xv: start up fullscreen\n");
-               vo_argv += 4;
-+            } else if (!strncmp (vo_argv, "use-defaults", 12)) {
-+              fprintf (stderr,
-+                       "[ProcessArgs] xv: don't change brigtness etc on startup\n");
-+              setupStore.xvUseDefaults=true;
-+              vo_argv += 12;
-             } else {
-                     fprintf(stderr,"[softdevice] ignoring unrecognized option \"%s\"!\n",argv[i]);
-                     esyslog("[softdevice] ignoring unrecognized option \"%s\"\n",argv[i]);
-Index: video-xv.c
-===================================================================
-RCS file: /cvsroot/softdevice/softdevice/video-xv.c,v
-retrieving revision 1.57
-diff -u -r1.57 video-xv.c
---- video-xv.c	16 Jul 2006 02:09:22 -0000	1.57
-+++ video-xv.c	16 Jul 2006 19:48:54 -0000
-@@ -126,6 +126,21 @@
- 
- /* ---------------------------------------------------------------------------
-  */
-+int cXvPortAttributeStore::GetValuePercent(int index)
-+{
-+      int value = portAttributeCurrentValues[index];
-+
-+      value = (int) (((double) value - (double) portAttributes[index].min_value) * 100.0
-+              / ((double) portAttributes[index].max_value - (double) portAttributes[index].min_value));
-+
-+      if (value <= 100 &&
-+          value >= 0)
-+        return value;
-+      return 0;
-+}
-+
-+/* ---------------------------------------------------------------------------
-+ */
- void cXvPortAttributeStore::SetValuePercent(char *name, int value)
- {
-   for (int i = 0; i < portAttributeCount; ++i)
-@@ -217,13 +232,29 @@
-         portAttributeCurrentValues[i] = portAttributeSaveValues[i];
-       }
-       if (!strcmp(portAttributes[i].name, "XV_BRIGHTNESS"))
-+      {
-         setupStore->vidCaps |= CAP_BRIGHTNESS;
-+        if (setupStore->xvUseDefaults)
-+                setupStore->vidBrightness = currBrightness = GetValuePercent(i);
-+      }
-       if (!strcmp(portAttributes[i].name, "XV_CONTRAST"))
-+      {
-         setupStore->vidCaps |= CAP_CONTRAST;
-+        if (setupStore->xvUseDefaults)
-+                setupStore->vidContrast = currContrast = GetValuePercent(i);
-+      }
-       if (!strcmp(portAttributes[i].name, "XV_HUE"))
-+      {
-         setupStore->vidCaps |= CAP_HUE;
-+        if (setupStore->xvUseDefaults)
-+                setupStore->vidHue = currHue = GetValuePercent(i);
-+      }
-       if (!strcmp(portAttributes[i].name, "XV_SATURATION"))
-+      {
-         setupStore->vidCaps |= CAP_SATURATION;
-+        if (setupStore->xvUseDefaults)
-+                setupStore->vidSaturation = currSaturation = GetValuePercent(i);
-+      }
- 
-       dsyslog("[XvVideoOut]:"
-               "   %-25s %-4sXvGettable %-4sXvSettable "
-Index: video-xv.h
-===================================================================
-RCS file: /cvsroot/softdevice/softdevice/video-xv.h,v
-retrieving revision 1.21
-diff -u -r1.21 video-xv.h
---- video-xv.h	27 May 2006 19:12:42 -0000	1.21
-+++ video-xv.h	16 Jul 2006 19:48:54 -0000
-@@ -91,6 +91,7 @@
-   void SetXInfo(Display *dpy, XvPortID port, cSetupStore *setupStore);
-   void SetValue(char *name, int value);
-   void SetValuePercent(char *name, int value);
-+  int GetValuePercent(int index);
-   void SetColorkey(int value);
-   void Increment(char *name);
-   void Decrement(char *name);
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-contrast.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-contrast.diff
deleted file mode 100644
index 6e5d1b770aca..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-contrast.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: video-xv.c
-===================================================================
-RCS file: /cvsroot/softdevice/softdevice/video-xv.c,v
-retrieving revision 1.54
-diff -u -r1.54 video-xv.c
---- video-xv.c	24 Apr 2006 22:56:47 -0000	1.54
-+++ video-xv.c	15 May 2006 20:32:17 -0000
-@@ -705,7 +705,9 @@
-       PutXvImage();
-       XSync(dpy, False);
-     }
-+#ifndef STAND_ALONE
-     attributeStore.CheckVideoParmChange();
-+#endif
-   }
- 
-   if(cursor_visible == True) {
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-key-init.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-key-init.diff
deleted file mode 100644
index 321b199a6d20..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-shm-key-init.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru softdevice-0.2.3.cvs/video-shm.c softdevice-0.2.3.cvs-shm-key-init/video-shm.c
---- softdevice-0.2.3.cvs/video-shm.c	2006-05-14 21:56:07.000000000 +0200
-+++ softdevice-0.2.3.cvs-shm-key-init/video-shm.c	2006-05-21 17:43:07.000000000 +0200
-@@ -122,7 +122,7 @@
-         //ctl->pict_shmid=-1;
-         curr_pict=NULL;
-         osd_surface=NULL;
--        ctl->key=kNone;
-+        ctl->key=NO_KEY;
-         remote = new cShmRemote("softdevice-xv",this);
- };
- 
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-threading.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-threading.diff
deleted file mode 100644
index 9c7a48fef555..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-threading.diff
+++ /dev/null
@@ -1,594 +0,0 @@
-diff -ru softdevice-orig/mpeg2decoder.c softdevice/mpeg2decoder.c
---- softdevice-orig/mpeg2decoder.c	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/mpeg2decoder.c	2006-05-21 18:35:43.000000000 +0200
-@@ -146,14 +146,12 @@
- 
- //  Context->debug |=0xF|FF_DEBUG_STARTCODE|FF_DEBUG_PTS;
- //  av_log_set_level(AV_LOG_DEBUG);
--  active=true;
-   Start(); // starte thread
- }
- 
- cStreamDecoder::~cStreamDecoder()
- {
-   CMDDEB("~cStreamDecoder: context %p\n",context );
--  active=false;
-   Cancel(3);
-   if (codec && context)
-     avcodec_close(context);
-@@ -165,21 +163,20 @@
- void cStreamDecoder::Action()
- {
-   CMDDEB("Neuer Thread gestartet: pid:%d type %d\n",getpid(),context->codec_type );
--  running=true;
-   freezeMode=false;
-   AVPacket *pkt;
- 
--  while ( PacketQueue.Available() < 7 && active) {
-+  while ( PacketQueue.Available() < 7 && Running()) {
-     BUFDEB("wait while loop packets %d StreamDecoder  pid:%d type %d\n",
-       PacketQueue.Available(),getpid(),context->codec_type );
-     usleep(10000);
-   };
- 
--  while(active)
-+  while(Running())
-   {
-     BUFDEB("while loop start StreamDecoder  pid:%d type %d\n",getpid(),context->codec_type );
- 
--    while (freezeMode && active)
-+    while (freezeMode && Running())
-         usleep(50000);
- 
-     mutex.Lock();
-@@ -210,7 +207,6 @@
- #endif
- 
-   }
--  running=false;
-   CMDDEB("thread finished pid: %d type %d \n",getpid(),context->codec_type );
- }
- 
-@@ -230,7 +226,6 @@
- void cStreamDecoder::Stop(void)
- {
-   CMDDEB("cStreamDecoder::Stop\n");
--  active=false;
-   if (syncTimer)
-     syncTimer->Signal();
-   mutex.Lock();
-@@ -419,7 +414,7 @@
-         break;
-     }
-   }
--  while ( size > 0 && active ) {
-+  while ( size > 0 && Running() ) {
-     BUFDEB("start decode audio. pkt size: %d \n",size);
-     len=avcodec_decode_audio(context, (short *)audiosamples,
-                  &audio_size, data, size);
-@@ -1113,7 +1108,6 @@
- 
-   StreamBuffer=NULL;
- 
--  running=false;
-   decoding=false;
-   IsSuspended=false;
-   Speed=1;
-@@ -1147,7 +1141,7 @@
- start:
-     int count=0;
-     size=StreamBuffer->Available();
--    while ( size < buf_size && ThreadActive
-+    while ( size < buf_size && Running()
-            && count <  1  ) {
-       BUFDEB("read_packet EnableGet.Sleep start\n");
-       EnableGetSignal.Sleep(50000);
-@@ -1160,7 +1154,7 @@
-    };
- 
-     // signal eof if thread should end...
--    if (!ThreadActive && size == 0)
-+    if (!Running() && size == 0)
-       return -1;
- 
-     size = buf_size;
-@@ -1177,7 +1171,7 @@
-        return size;
-     } else  {
-        BUFDEB("read_packet u is NULL!!!\n");
--       if (ThreadActive) {
-+       if (Running()) {
-          //try again...
-          usleep(10000);
-          goto start;
-@@ -1214,16 +1208,14 @@
- void cMpeg2Decoder::Action()
- {
-   CMDDEB("Neuer Thread gestartet: Mpeg2Decoder pid %d\n",getpid());
--  ThreadRunning=true;
--  //ThreadActive=true;
-   AVPacket  pkt;
-   int ret;
-   int PacketCount=0;
- 
-   int nStreams=0;
- 
--  while(ThreadActive) {
--        while (freezeMode && ThreadActive)
-+  while(Running()) {
-+        while (freezeMode && Running())
-           usleep(50000);
- 
-         BUFDEB("av_read_frame start\n");
-@@ -1231,7 +1223,7 @@
-         ret = av_read_packet(ic, &pkt);
-         if (ret < 0) {
-             BUFDEB("cMpeg2Decoder Stream Error!\n");
--            if (ThreadActive)
-+            if (Running())
- 		    usleep(10000);
-             continue;
-         }
-@@ -1260,7 +1252,6 @@
- //        if (PacketCount == 200)
- //          dump_format(ic, 0, "test", 0);
-   }
--  running=false;
-   CMDDEB("Thread beendet : mpegDecoder pid %d\n",getpid());
- }
- 
-@@ -1371,7 +1362,7 @@
-   voutMutex.Lock();
-   if ( packet_type == CODEC_TYPE_VIDEO && vout ) {
-     BUFDEB("QueuePacket video stream\n");
--    while ( vout->PutPacket(pkt) == -1 && ThreadActive ) {
-+    while ( vout->PutPacket(pkt) == -1 && Running() ) {
-       // PutPacket sleeps is necessary
-       //printf("Video Buffer full\n");
-     };
-@@ -1381,7 +1372,7 @@
-   aoutMutex.Lock();
-   if ( packet_type == CODEC_TYPE_AUDIO && aout ) {
-     BUFDEB("QueuePacket audio stream\n");
--    while ( aout->PutPacket(pkt) == -1 && ThreadActive ) {
-+    while ( aout->PutPacket(pkt) == -1 && Running() ) {
-       // PutPacket sleeps is necessary
-       //printf("Audio Buffer full\n");
-     };
-@@ -1398,7 +1389,7 @@
- void cMpeg2Decoder::Start(bool GetMutex)
- {
-   CMDDEB("Mpeg2Decoder Start IsSuspended %d  GetMutex %d\n",IsSuspended,GetMutex);
--  if (running)
-+  if (Running())
-           return;
- 
-   if (IsSuspended)
-@@ -1416,12 +1407,10 @@
-   StreamBuffer->Clear();
-   initStream();
- 
--  ThreadActive=true;
-   freezeMode=false;
-   AudioIdx=NO_STREAM;
-   VideoIdx=NO_STREAM;
-   cThread::Start();
--  running=true;
-   if (GetMutex)
-     mutex.Unlock();
-   CMDDEB("mpeg2Decoder Start finished");
-@@ -1464,7 +1453,7 @@
- {
-   CMDDEB("Play\n");
-   freezeMode=false;
--  if (running)
-+  if (Running())
-   {
-     aoutMutex.Lock();
-     if (aout)
-@@ -1510,7 +1499,7 @@
-   // sleep a short while before putting the
-   // audio and video stream decoders to sleep
-   usleep(20000);
--  if (running)
-+  if (Running())
-   {
-     if (Stream & SOFTDEVICE_AUDIO_STREAM) {
-       aoutMutex.Lock();
-@@ -1538,10 +1527,8 @@
-   // can't stop properly in freeze mode
-   //  Freeze();
-   freezeMode=false;
--  if (running)
-+  if (Running())
-   {
--    running=false;
--    ThreadActive=false;
- 
-     StreamBuffer->Clear();
-     EnableGetSignal.Signal();
-@@ -1649,7 +1636,7 @@
-   } else if (AudioIdx==DONT_PLAY)
-     AudioIdx=NO_STREAM;
-   Play();
--  if (running)
-+  if (Running())
-   {
-     aoutMutex.Lock();
-     if (aout)
-@@ -1674,7 +1661,7 @@
- /* ----------------------------------------------------------------------------
-  */
- int64_t cMpeg2Decoder::GetSTC(void) {
--  if (running) {
-+  if (Running()) {
-     return clock.GetPTS()*9;
- /*
-     if (vout)
-@@ -1719,15 +1706,15 @@
- {
-   BUFDEB("Decode %p, Length %d\n",Data,Length);
- 
--  if (running && !IsSuspended && setupStore.shouldSuspend)
-+  if (Running() && !IsSuspended && setupStore.shouldSuspend)
-      // still running and should suspend
-      Suspend();
- 
--  if (!running && IsSuspended && !setupStore.shouldSuspend)
-+  if (!Running() && IsSuspended && !setupStore.shouldSuspend)
-      // not running and should resume
-      Resume();
- 
--  if (!running) {
-+  if (!Running()) {
-     BUFDEB("not running..\n");
-     return Length;
-   };
-diff -ru softdevice-orig/mpeg2decoder.h softdevice/mpeg2decoder.h
---- softdevice-orig/mpeg2decoder.h	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/mpeg2decoder.h	2006-05-21 18:33:48.000000000 +0200
-@@ -161,8 +161,6 @@
-     AVCodecContext    *context;
- 
-     cMutex            mutex;
--    volatile bool     active;
--    bool              running;
- 
-     virtual void      Action(void);
-     virtual int       DecodePacket(AVPacket *pkt) = 0;
-@@ -282,7 +280,6 @@
-     cMutex          aoutMutex;
-     cAudioOut       *audioOut;
-     cVideoOut       *videoOut;
--    bool running;
-     bool IsSuspended;
-     bool decoding;
-     bool freezeMode;
-@@ -295,7 +292,6 @@
-     cSoftRingBufferLinear *StreamBuffer;
-     void initStream();
-     virtual void Action(void);
--    volatile bool   ThreadActive, ThreadRunning;
-     cClock  clock;
-     //demuxing
-     int AudioIdx;
-diff -ru softdevice-orig/SoftOsd.c softdevice/SoftOsd.c
---- softdevice-orig/SoftOsd.c	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/SoftOsd.c	2006-05-21 18:14:26.000000000 +0200
-@@ -32,7 +32,7 @@
-  */
- 
- cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y) 
--	: cOsd(X, Y),active(false),close(false) {
-+	: cOsd(X, Y),close(false) {
-         OSDDEB("cSoftOsd constructor\n");
-         OutputConvert=&cSoftOsd::ARGB_to_ARGB32;
-         pixelMask=NULL;
-@@ -71,7 +71,6 @@
- cSoftOsd::~cSoftOsd() {
-         OSDDEB("cSoftOsd destructor\n");
-         close=true;
--        active=false;
-         Cancel(3);
-         if (videoOut) {
-                 videoOut->CloseOSD();
-@@ -83,8 +82,7 @@
- /* -------------------------------------------------------------------------*/
- void cSoftOsd::Action() {
-         OSDDEB("OSD thread started\n");
--        active=true;
--        while(active && videoOut && !close) {
-+        while(Running() && videoOut && !close) {
-                 int newOsdWidth;
-                 int newOsdHeight;
-                 int newXPan, newYPan;
-@@ -249,7 +247,7 @@
- 
- 	// give priority to the other threads
- 	pthread_yield();
--        if (!active && !close)
-+        if (!Running() && !close)
-                 Start();
- }
- 
-diff -ru softdevice-orig/SoftOsd.h softdevice/SoftOsd.h
---- softdevice-orig/SoftOsd.h	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/SoftOsd.h	2006-05-21 18:13:55.000000000 +0200
-@@ -75,7 +75,6 @@
-     void ConvertPalette(tColor *dest_palette, const tColor *orig_palette, 
- 		    int maxColors);
-    
--    bool active;
-     bool close;
-     int ScreenOsdWidth;
-     int ScreenOsdHeight;
-diff -ru softdevice-orig/VdrReplacements.c softdevice/VdrReplacements.c
---- softdevice-orig/VdrReplacements.c	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/VdrReplacements.c	2006-05-21 18:08:15.000000000 +0200
-@@ -12,6 +12,9 @@
- #include "VdrReplacements.h"
- #include <stdio.h>
- #include <unistd.h>
-+#include <signal.h>
-+#include <errno.h>
-+#include <sys/syscall.h>
- 
- cMutex::cMutex() {
-         pthread_mutexattr_t attr;
-@@ -34,14 +37,18 @@
- 
- //-------------------------------------------------------------------------
- 
--void StartThread(cThread *thread) {
--        thread->active=true;
--        thread->Action();
--        thread->active=false;
-+void *cThread::StartThread(cThread *Thread) {
-+  Thread->childThreadId = ThreadId();
-+  Thread->Action();
-+  Thread->running = false;
-+  Thread->active = false;
-+  return NULL;
- };
- 
- cThread::cThread() {
--        active=false;
-+        active = running = false;
-+	childTid = 0;
-+	childThreadId = 0;
- };
- 
- cThread::~cThread() {
-@@ -49,32 +56,66 @@
- }; 
- 
- bool cThread::Start() {
--        if (active)
--                return false;
--
--        active=true;
--        if ( pthread_create(&childTid, NULL, (void *(*) (void*))&StartThread,
--                                        (void *)this)!=0 ) {
--                fprintf(stderr,"Error starting thread\n");
--                active=false;
--                return false;
--        };
--
--        pthread_detach(childTid);
--        return true;
--};
--
--void cThread::Cancel(int TimeOut) {
--        int timeoutms=TimeOut*1000;
--        while (active && TimeOut>0) {
--                usleep(5000);
--                timeoutms-=5000;
--        };
--
--        if (active) {
--                pthread_cancel(childTid);
--                childTid=0;
--                active=false;
--        };
--};
-+  if (!active) {
-+    active = running = true;
-+    if ( pthread_create(&childTid, NULL, (void *(*) (void*))&StartThread, (void *)this) == 0 ) {
-+      pthread_detach(childTid); // auto-reap
-+      pthread_setschedparam(childTid, SCHED_RR, 0);
-+      }
-+    else {
-+      LOG_ERROR;
-+      active = running = false;
-+      return false;
-+      }
-+    }
-+  return true;
-+};
-+
-+void cThread::Cancel(int WaitSeconds) {
-+  running = false;
-+  if (active) {
-+    if (WaitSeconds > 0) {
-+      for (time_t t0 = time(NULL) + WaitSeconds; time(NULL) < t0; ) {
-+        if (!Active())
-+          return;
-+        usleep(10000);
-+        }
-+      }
-+    pthread_cancel(childTid);
-+    childTid = 0;
-+    active = false;
-+    }
-+};
-+
-+bool cThread::Active(void)
-+{
-+  if (active) {
-+    //
-+    // Single UNIX Spec v2 says:
-+    //
-+    // The pthread_kill() function is used to request
-+    // that a signal be delivered to the specified thread.
-+    //
-+    // As in kill(), if sig is zero, error checking is
-+    // performed but no signal is actually sent.
-+    //
-+    int err;
-+    if ((err = pthread_kill(childTid, 0)) != 0) {
-+      if (err != ESRCH)
-+        LOG_ERROR;
-+      childTid = 0;
-+      active = running = false;
-+      }
-+    else
-+      return true;
-+    }
-+  return false;
-+}
-+
-+_syscall0(pid_t, gettid)
-+
-+tThreadId cThread::ThreadId(void)
-+{
-+  return gettid();
-+}
- 
-diff -ru softdevice-orig/VdrReplacements.h softdevice/VdrReplacements.h
---- softdevice-orig/VdrReplacements.h	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/VdrReplacements.h	2006-05-21 18:10:00.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <pthread.h>
- #include <stdio.h>
- #include <stdint.h>
-+#include <sys/types.h>
- 
- #define VDRVERSNUM 10308
- 
-@@ -58,22 +59,32 @@
- 
- };
- 
-+typedef pid_t tThreadId;
-+
- class cThread {
--        friend void StartThread(cThread *);
-+	private:
-+		static void *StartThread(cThread *Thread);
-         private:
--                bool active;
-+                bool running;
-+		bool active;
-+	protected:
-+		bool Running(void) { return running; }
-                 pthread_t childTid;
-+		tThreadId childThreadId;
-         public:
-                 cThread();
-                 virtual ~cThread();
- 
-                 bool Start();
-+		bool Active(void);
-                 void Cancel( int Timeout = 0 );
-+		static tThreadId ThreadId(void);
- 
-                 virtual void Action()
-                 {};
- };
- 
--        
-+#define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
-+
- 
- #endif
-diff -ru softdevice-orig/video.c softdevice/video.c
---- softdevice-orig/video.c	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/video.c	2006-05-21 18:12:27.000000000 +0200
-@@ -58,13 +58,11 @@
-   init_OsdBuffers();
- 
-   //start osd thread
--  active=true;
-   Start();
- }
- 
- cVideoOut::~cVideoOut()
- {
--  active=false;
-   Cancel(3);
-   dsyslog("[VideoOut]: Good bye");
- }
-@@ -96,7 +94,7 @@
- {
-   ClearOSD();
- #if VDRVERSNUM >= 10307
--  while(active)
-+  while(Running())
-   {
-     OsdRefreshCounter++;
-     usleep(20000);
-diff -ru softdevice-orig/video-dfb.h softdevice/video-dfb.h
---- softdevice-orig/video-dfb.h	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/video-dfb.h	2006-05-21 18:15:23.000000000 +0200
-@@ -81,7 +81,6 @@
-  */
- class cDFBRemote : public cRemote, private cThread {
-   private:
--    bool                  active;
-     cDFBVideoOut          *video_out;
- 
-     virtual void  Action(void);
-diff -ru softdevice-orig/video.h softdevice/video.h
---- softdevice-orig/video.h	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/video.h	2006-05-21 18:12:07.000000000 +0200
-@@ -144,7 +144,6 @@
- 
-     cSetupStore *setupStore;
- 
--    bool active;
-     uint16_t OsdRefreshCounter;
-     // should be setted to null everytime OSD is shown
-     // (software alpha blending mode).
-diff -ru softdevice-orig/video-shm.c softdevice/video-shm.c
---- softdevice-orig/video-shm.c	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/video-shm.c	2006-05-21 18:17:45.000000000 +0200
-@@ -25,7 +25,7 @@
- };
- 
- void cShmRemote::Action(void) {
--        while (active) {
-+        while (Running()) {
-                 SHMDEB("cShmRemote trying to get a lock\n");
-                 sem_wait_lock(vout->ctl->semid,KEY_MUT);
-                 SHMDEB("cShmRemote got lock\n");
-diff -ru softdevice-orig/video-shm.h softdevice/video-shm.h
---- softdevice-orig/video-shm.h	2006-05-21 17:49:35.000000000 +0200
-+++ softdevice/video-shm.h	2006-05-21 18:17:27.000000000 +0200
-@@ -63,7 +63,6 @@
-  */
- class cShmRemote : public cRemote, private cThread {
-   private:
--    bool        active;
-     cShmVideoOut *vout;
- 
-     virtual void Action(void);
-@@ -71,7 +70,6 @@
-           cShmRemote(const char *Name, cShmVideoOut *video_out) 
-                   : cRemote(Name) {
-                   vout=video_out;
--                  active=true;
-                   Start();
-           };
-           
-@@ -79,10 +77,9 @@
-           
-           void Stop()
-           {
--                  if (!vout || !active)
-+                  if (!vout || !Running())
-                           return;
- 
--                  active = false;
-                   // signal new key to stop the thread from waiting
-                   sem_sig_unlock(vout->ctl->semid,KEY_SIG);
-         
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-xv-settings.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-xv-settings.diff
deleted file mode 100644
index 5e592127e456..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3-xv-settings.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ru --exclude=CVS --ignore-matching-lines=Id: softdevice-0.2.3.20060511/video-xv.c softdevice-0.2.3.20060511-zzam/video-xv.c
---- softdevice-0.2.3.20060511/video-xv.c	2006-04-25 00:56:47.000000000 +0200
-+++ softdevice-0.2.3.20060511-zzam/video-xv.c	2006-05-13 20:31:19.000000000 +0200
-@@ -126,6 +126,21 @@
- 
- /* ---------------------------------------------------------------------------
-  */
-+int cXvPortAttributeStore::GetValuePercent(int index)
-+{
-+      int value = portAttributeCurrentValues[index];
-+
-+      value = (int) (((double) value - (double) portAttributes[index].min_value) * 100.0
-+              / ((double) portAttributes[index].max_value - (double) portAttributes[index].min_value));
-+
-+      if (value <= 100 &&
-+          value >= 0)
-+        return value;
-+      return 0;
-+}
-+
-+/* ---------------------------------------------------------------------------
-+ */
- void cXvPortAttributeStore::SetValuePercent(char *name, int value)
- {
-   for (int i = 0; i < portAttributeCount; ++i)
-@@ -149,15 +164,16 @@
- 
- /* ---------------------------------------------------------------------------
-  */
--void cXvPortAttributeStore::SetColorkey(int value)
-+int cXvPortAttributeStore::SetColorkey(int value)
- {
-   for (int i = 0; i < portAttributeCount; ++i)
-   {
-     if (!strcmp("XV_COLORKEY",portAttributes[i].name))
-     {
-+      int oldColorkey = portAttributeCurrentValues[i];
-       portAttributeCurrentValues[i] = value;
-       XvSetPortAttribute(dpy,port,portAttributeAtoms[i],portAttributeCurrentValues[i]);
--      return;
-+      return oldColorkey;
-     }
-   }
- }
-@@ -217,13 +233,25 @@
-         portAttributeCurrentValues[i] = portAttributeSaveValues[i];
-       }
-       if (!strcmp(portAttributes[i].name, "XV_BRIGHTNESS"))
-+      {
-         setupStore->vidCaps |= CAP_BRIGHTNESS;
-+	setupStore->vidBrightness = currBrightness = GetValuePercent(i);
-+      }
-       if (!strcmp(portAttributes[i].name, "XV_CONTRAST"))
-+      {
-         setupStore->vidCaps |= CAP_CONTRAST;
-+	setupStore->vidContrast = currContrast = GetValuePercent(i);
-+      }
-       if (!strcmp(portAttributes[i].name, "XV_HUE"))
-+      {
-         setupStore->vidCaps |= CAP_HUE;
-+	setupStore->vidHue = currHue = GetValuePercent(i);
-+      }
-       if (!strcmp(portAttributes[i].name, "XV_SATURATION"))
-+      {
-         setupStore->vidCaps |= CAP_SATURATION;
-+	setupStore->vidSaturation = currSaturation = GetValuePercent(i);
-+      }
- 
-       dsyslog("[XvVideoOut]:"
-               "   %-25s %-4sXvGettable %-4sXvSettable "
-diff -ru --exclude=CVS --ignore-matching-lines=Id: softdevice-0.2.3.20060511/video-xv.h softdevice-0.2.3.20060511-zzam/video-xv.h
---- softdevice-0.2.3.20060511/video-xv.h	2006-04-23 21:38:29.000000000 +0200
-+++ softdevice-0.2.3.20060511-zzam/video-xv.h	2006-05-13 20:29:38.000000000 +0200
-@@ -91,7 +91,8 @@
-   void SetXInfo(Display *dpy, XvPortID port, cSetupStore *setupStore);
-   void SetValue(char *name, int value);
-   void SetValuePercent(char *name, int value);
--  void SetColorkey(int value);
-+  int GetValuePercent(int index);
-+  int SetColorkey(int value);
-   void Increment(char *name);
-   void Decrement(char *name);
-   void Save();
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3a-CVS-20060511.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3a-CVS-20060511.diff
deleted file mode 100644
index 4b6780ad691e..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.2.3a-CVS-20060511.diff
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -ru --exclude=CVS softdevice-0.2.3a/configure softdevice-0.2.3.20060511/configure
---- softdevice-0.2.3a/configure	2006-05-01 08:15:18.000000000 +0200
-+++ softdevice-0.2.3.20060511/configure	2006-05-07 22:52:23.000000000 +0200
-@@ -97,6 +97,7 @@
- dfb_sourcelocation="yes"
- dfb_dscaps_double="yes"
- dfb_dief_repeat="yes"
-+dfb_blit_interlaced="yes"
- 
- cat > ${TMPC} << EOF
- #include <directfb.h>
-@@ -148,6 +149,17 @@
- EOF
- $cc $CFLAGS $dfb_opts -o $TMPE $TMPC > /dev/null 2>&1 || dfb_dief_repeat="no"
- 
-+cat > ${TMPC} << EOF
-+#include <stdio.h>
-+#include <dfb++.h>
-+#include <directfb.h>
-+int main(void) {
-+    DFBSurfaceBlittingFlags   flags = DSBLIT_INTERLACED;
-+  return 0;
-+}
-+EOF
-+$cc $CFLAGS $dfb_opts -o $TMPE $TMPC > /dev/null 2>&1 || dfb_blit_interlaced="no"
-+
-   fi
- fi
- # end of DirectFB specific tests
-@@ -304,6 +316,12 @@
-   else
-     echo "#define HAVE_DIEF_REPEAT                0" >> $TMPH
-   fi
-+
-+  if test "${dfb_blit_interlaced}" = "yes" ; then
-+    echo "#define HAVE_DSBLIT_INTERLACED          1" >> $TMPH
-+  else
-+    echo "#define HAVE_DSBLIT_INTERLACED          0" >> $TMPH
-+  fi
- fi
- 
- ###############################################################################
-diff -ru --exclude=CVS softdevice-0.2.3a/setup-softdevice.h softdevice-0.2.3.20060511/setup-softdevice.h
---- softdevice-0.2.3a/setup-softdevice.h	2006-04-29 08:25:58.000000000 +0200
-+++ softdevice-0.2.3.20060511/setup-softdevice.h	2006-05-04 23:40:12.000000000 +0200
-@@ -114,7 +114,7 @@
-     char          *getPPValue(void);
-     void          CropModeNext(void);
- 
--    virtual bool  CatchRemoteKey(const char *remoteName, uint64_t key);
-+    virtual bool  CatchRemoteKey(const char *remoteName, uint64 key);
- 
-     int   xvAspect;
-     int   xvMaxArea;
-diff -ru --exclude=CVS softdevice-0.2.3a/video-dfb.c softdevice-0.2.3.20060511/video-dfb.c
---- softdevice-0.2.3a/video-dfb.c	2006-05-01 08:15:19.000000000 +0200
-+++ softdevice-0.2.3.20060511/video-dfb.c	2006-05-07 22:52:23.000000000 +0200
-@@ -19,6 +19,7 @@
- # include "config.h"
- #else
- # define HAVE_SetSourceLocation 0
-+# define HAVE_DSBLIT_INTERLACED 0
- # if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23)
- #   define HAVE_GraphicsDeviceDescription 0
- #   define HAVE_DIEF_REPEAT               0
-@@ -165,6 +166,9 @@
-   if (caps.blitting_flags & DSBLIT_DST_PREMULTIPLY ) fprintf(stderr,"DstPremultiply ");
-   if (caps.blitting_flags & DSBLIT_DEMULTIPLY ) fprintf(stderr,"Demultiply ");
-   if (caps.blitting_flags & DSBLIT_DEINTERLACE ) fprintf(stderr,"Deinterlace ");
-+#if HAVE_DSBLIT_INTERLACED
-+  if (caps.blitting_flags & DSBLIT_INTERLACED ) fprintf(stderr,"Interlaced ");
-+#endif
-   fprintf(stderr,"\n");
- }
- 
-@@ -889,6 +893,12 @@
-             videoSurface->Clear(COLORKEY,0); //clear and
-             videoSurface->Release();
-           }
-+#if HAVE_DSBLIT_INTERLACED
-+	  if (setupStore->useMGAtv)
-+	  {
-+	    vidDsc.caps = DFB_ADD_SURFACE_CAPS(vidDsc.caps, DSCAPS_INTERLACED);
-+	  }
-+#endif	  
- 
-           videoSurface=dfb->CreateSurface(vidDsc);
-           /* --------------------------------------------------------------------
-@@ -1205,8 +1215,21 @@
-         clearBackground--;
-       }
- 
-+#if HAVE_DSBLIT_INTERLACED
-+      if (setupStore->useMGAtv)
-+      {
-+        scrSurface->SetBlittingFlags(DSBLIT_INTERLACED);
-+        scrSurface->StretchBlit(videoSurface, &src, &dst);
-+      }
-+      else
-+      {
-+        scrSurface->SetBlittingFlags(DSBLIT_NOFX);
-+        scrSurface->StretchBlit(videoSurface, &src, &dst);
-+      }
-+#else
-       scrSurface->SetBlittingFlags(DSBLIT_NOFX);
-       scrSurface->StretchBlit(videoSurface, &src, &dst);
-+#endif      
-       if (OSDpresent)
-       {
-         osdsrc.x = osdsrc.y = 0;
-@@ -1306,14 +1329,23 @@
- #endif
-     } else if (pixelformat == DSPF_YUY2) {
- 
--      yv12_to_yuy2(Py + Ystride  * cutTop * 2 + cutLeft * 2,
--      //yv12_to_yuy2_il_c(Py + Ystride  * cutTop * 2 + cutLeft * 2,
--                   Pu + UVstride * cutTop + cutLeft,
--                   Pv + UVstride * cutTop + cutLeft,
--                   dst + pitch * cutTop * 2 + cutLeft * 4,
--                   Width - 2 * (cutLeft + cutRight),
--                   Height - 2 * (cutTop + cutBottom),
--                   Ystride, UVstride, pitch);
-+      if (interlaceMode) {
-+        yv12_to_yuy2_il_c(Py + Ystride  * cutTop * 2 + cutLeft * 2,
-+                          Pu + UVstride * cutTop + cutLeft,
-+                          Pv + UVstride * cutTop + cutLeft,
-+                          dst + pitch * cutTop * 2 + cutLeft * 4,
-+                          Width - 2 * (cutLeft + cutRight),
-+                          Height - 2 * (cutTop + cutBottom),
-+                          Ystride, UVstride, pitch);
-+      } else {
-+        yv12_to_yuy2(Py + Ystride  * cutTop * 2 + cutLeft * 2,
-+                     Pu + UVstride * cutTop + cutLeft,
-+                     Pv + UVstride * cutTop + cutLeft,
-+                     dst + pitch * cutTop * 2 + cutLeft * 4,
-+                     Width - 2 * (cutLeft + cutRight),
-+                     Height - 2 * (cutTop + cutBottom),
-+                     Ystride, UVstride, pitch);
-+      }
-      }
- 
-     videoSurface->Unlock();
-@@ -1345,8 +1377,19 @@
- 
-       osdMutex.Unlock();
- 
-+#if HAVE_DSBLIT_INTERLACED
-+      if (setupStore->useMGAtv)
-+      {
-+        scrSurface->SetBlittingFlags(DSBLIT_INTERLACED);
-+        scrSurface->StretchBlit(videoSurface, &src, &dst);
-+      } else {
-+        scrSurface->SetBlittingFlags(DSBLIT_NOFX);
-+        scrSurface->StretchBlit(videoSurface, &src, &dst);
-+      }
-+#else
-       scrSurface->SetBlittingFlags(DSBLIT_NOFX);
-       scrSurface->StretchBlit(videoSurface, &src, &dst);
-+#endif      
- 
-       if (OSDpresent)
-       {
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
deleted file mode 100644
index 21a8fb25b3bc..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2006 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.2.3.20060511-r7.ebuild,v 1.4 2006/08/14 18:51:33 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV="$(get_version_component_range 1-3)a"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="VDR plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="xv fbcon directfb mmx mmxext"
-
-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
-			)
-			virtual/x11
-		) )"
-
-DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-			)
-			virtual/x11
-	) )
-	fbcon? ( sys-kernel/linux-headers )"
-
-
-S=${WORKDIR}/${VDRPLUGIN}-${MY_PV}
-PATCHES="${FILESDIR}/${MY_P}-CVS-20060511.diff
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-contrast.diff
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-key-init.diff
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/vdr-softdevice-0.2.3-picture-settings-use-defaults.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
-			einfo "SHM does only support xv at the moment"
-		fi
-	else
-		einfo "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	einfo "SHM support will not be compiled." ;;
-		1)	einfo "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/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
-
-	use mmx || sed -i ${S}/Makefile -e '/MMX$/d'
-	use mmxext || sed -i ${S}/Makefile -e '/MMX2$/d'
-
-	# Do not force MMX on in configure
-	sed -i ${S}/configure -e '/USE_MMX/s/^.*$/:/'
-}
-
-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"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd ${S}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsubvdr-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-	fi
-}
-
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild
deleted file mode 100644
index 2731167f0e37..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060814-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2006 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.2.3.20060814-r1.ebuild,v 1.2 2006/08/16 09:42:17 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV="$(get_version_component_range 4)"
-MY_P=${PN}-cvs-${MY_PV}
-
-DESCRIPTION="VDR plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-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 )
-			)
-			virtual/x11
-		) )"
-
-DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-	) )
-	fbcon? ( sys-kernel/linux-headers )"
-
-
-S=${WORKDIR}/${VDRPLUGIN}-cvs-${MY_PV}
-PATCHES="
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-key-init.diff
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch
-		${FILESDIR}/softdevice-cvs-libcle266mpegdec-0.2.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
-			einfo "SHM does only support xv at the moment"
-		fi
-	else
-		einfo "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	einfo "SHM support will not be compiled." ;;
-		1)	einfo "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/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"
-
-	# MMX-Support
-	# hardcode mmx for amd64 - do not disable even without use-flag
-	if ! use amd64; then
-		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
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd ${S}
-	einfo 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.2.3.20060908.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060908.ebuild
deleted file mode 100644
index a1bbbe91c68d..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060908.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2006 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.2.3.20060908.ebuild,v 1.1 2006/09/08 19:35:09 zzam Exp $
-
-inherit vdr-plugin versionator flag-o-matic
-
-MY_PV="$(get_version_component_range 4)"
-MY_P=${PN}-cvs-${MY_PV}
-
-DESCRIPTION="VDR plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-		http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-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 )
-			)
-			virtual/x11
-		) )"
-
-DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-	) )
-	fbcon? ( sys-kernel/linux-headers )"
-
-
-S=${WORKDIR}/${VDRPLUGIN}-cvs-${MY_PV}
-PATCHES="
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch
-		${FILESDIR}/softdevice-cvs-libcle266mpegdec-0.2.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
-			einfo "SHM does only support xv at the moment"
-		fi
-	else
-		einfo "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	einfo "SHM support will not be compiled." ;;
-		1)	einfo "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/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
-
-	replace-flags -O* -O0
-}
-
-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"
-
-	# MMX-Support
-	# hardcode mmx for amd64 - do not disable even without use-flag
-	if ! use amd64; then
-		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
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd ${S}
-	einfo 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.2.3.20060912.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060912.ebuild
deleted file mode 100644
index 0313d9682ff8..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060912.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2006 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.2.3.20060912.ebuild,v 1.1 2006/09/12 10:00:41 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV="$(get_version_component_range 4)"
-MY_P=${PN}-cvs-${MY_PV}
-
-DESCRIPTION="VDR plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-		http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-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 )
-			)
-			virtual/x11
-		) )"
-
-DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-	) )
-	fbcon? ( sys-kernel/linux-headers )"
-
-
-S=${WORKDIR}/${VDRPLUGIN}-cvs-${MY_PV}
-PATCHES="
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch
-		${FILESDIR}/softdevice-cvs-libcle266mpegdec-0.2.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
-			einfo "SHM does only support xv at the moment"
-		fi
-	else
-		einfo "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	einfo "SHM support will not be compiled." ;;
-		1)	einfo "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/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"
-
-	# MMX-Support
-	# hardcode mmx for amd64 - do not disable even without use-flag
-	if ! use amd64; then
-		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
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd ${S}
-	einfo 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.3.0.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0.ebuild
deleted file mode 100644
index e881c255fe2d..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2006 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.3.0.ebuild,v 1.1 2006/10/09 21:24:51 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-SRC_URI="mirror://gentoo/${P}.tgz
-		http://dev.gentoo.org/~zzam/distfiles/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-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 )
-			)
-			virtual/x11
-		) )"
-
-DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-	) )
-	fbcon? ( sys-kernel/linux-headers )"
-
-
-PATCHES="
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.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
-			einfo "SHM does only support xv at the moment"
-		fi
-	else
-		einfo "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	einfo "SHM support will not be compiled." ;;
-		1)	einfo "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/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"
-
-	# MMX-Support
-	# hardcode mmx for amd64 - do not disable even without use-flag
-	if ! use amd64; then
-		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
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd ${S}
-	einfo 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
-}
-