cleanup

svn path=/vdr-devel/; revision=1221

20 files changed, 9 insertions, 6806 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index f623756..8adc308 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Apr 2013; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.7.23.ebuild,
+  -vdr-1.7.24-r1.ebuild, -vdr-1.7.25.ebuild, -vdr-1.7.30.ebuild,
+  -vdr-1.7.31.ebuild, -vdr-1.7.32-r1.ebuild, -vdr-1.7.33.ebuild,
+  -vdr-1.7.33-r1.ebuild, -vdr-1.7.36.ebuild, -vdr-1.7.36-r1.ebuild,
+  -vdr-1.7.38.ebuild, -vdr-1.7.39.ebuild, -vdr-1.7.40.ebuild,
+  -vdr-1.7.41.ebuild, -vdr-1.7.41-r1.ebuild, -vdr-1.7.42.ebuild,
+  -vdr-2.0.0.ebuild, -metadata.xml:
+  cleanup
+
 *vdr-2.0.0 (31 Mar 2013)
 
   31 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.0.0.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
deleted file mode 100644
index 99dbcb0..0000000
--- a/media-video/vdr/Manifest
+++ /dev/null
@@ -1,67 +0,0 @@
-AUX 1.7.24-time_shift.patch 405 SHA256 99256af917d877b8e4e5cf23246c4c7fca6ba78aa3b9b30111f36f3915813409 SHA512 7c9ad6213eb0b8097a3b27cf00b6895bd8459710e2b271e95fa462e538f60e69b44e14c10618b7a11a8fdcc1a070fde16c609dd887ca6a7e6219b144da5f0029 WHIRLPOOL 94ddbad12c290a3724cee41bb7f0d3278546a3ef3089d074afe0258ba76fd2d7528875fc9d88f40ca02a3a964fae665fe3848d183a5e3edcc6c53929a9ff1ba6
-AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
-AUX extpng-vdr-1.7.38-gentoo-edition-v3_001-addon-permashift.patch 10064 SHA256 8c0c161a4920e187a90786baa5bf9d9ade6b95fa7f3648d859e6c50c5f31266e SHA512 0bd76fc07fc9e06019256ccdb19c158d16c8791d3a15996a37ca0b0e6cc60d7a817e96fe98a331b716363ec0c693111c509e69ec9bfb6cd2bf2107510ec262e0 WHIRLPOOL a7dbdcbde24b2e357d27f023361576409f367f6fb0b7bb70bc9af5af41c2099762f12d2044f3d2f9feaf8fb9e7bbb5171dbd0b93f6d0a59ffdda74753690c4b2
-AUX extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch 10064 SHA256 8c0c161a4920e187a90786baa5bf9d9ade6b95fa7f3648d859e6c50c5f31266e SHA512 0bd76fc07fc9e06019256ccdb19c158d16c8791d3a15996a37ca0b0e6cc60d7a817e96fe98a331b716363ec0c693111c509e69ec9bfb6cd2bf2107510ec262e0 WHIRLPOOL a7dbdcbde24b2e357d27f023361576409f367f6fb0b7bb70bc9af5af41c2099762f12d2044f3d2f9feaf8fb9e7bbb5171dbd0b93f6d0a59ffdda74753690c4b2
-AUX extpng-vdr-1.7.41-gentoo-edition-v1_001-plugin-permashift.patch 10064 SHA256 8c0c161a4920e187a90786baa5bf9d9ade6b95fa7f3648d859e6c50c5f31266e SHA512 0bd76fc07fc9e06019256ccdb19c158d16c8791d3a15996a37ca0b0e6cc60d7a817e96fe98a331b716363ec0c693111c509e69ec9bfb6cd2bf2107510ec262e0 WHIRLPOOL a7dbdcbde24b2e357d27f023361576409f367f6fb0b7bb70bc9af5af41c2099762f12d2044f3d2f9feaf8fb9e7bbb5171dbd0b93f6d0a59ffdda74753690c4b2
-AUX vdr-1.7.22-makefile-install-header.diff 547 SHA256 64268af26ce43d0e3708969b67d82a6c230ec44942cb953b1b1af7bf8db30a98 SHA512 e775c2f32412ebe0de8d5d06dc5e31a60375a396d905b89caa08245212db40d4fad6af22d78c8ef94ce1a178020dbf4b67770cbfb79085689c6a78807c17a20f WHIRLPOOL 8a81443a863c211a76cc769f9a54618a6d200182d512c89a5bee4293e81e7b2f7547e3905cbff9ed7b8e5932c1ab8cfebe12f1bcfc81fbca526a4ab6748353fd
-AUX vdr-1.7.22-shared-tinyxml.diff 1228 SHA256 a7b02f113633520e61cf5389ae2e61ef06a071d7814c6770979d5b4835c57f6a SHA512 9c9f787b3a21ef3607a91d599ffa208d9a1fc98187daf104b716712d22f1a89d4c187a5f4282ba14a6f505c7be2b191b8d6984daffd693b52e3880db8c0ee2fa WHIRLPOOL 570b53ed545188b8048bec65349060ebbacdd1e203ebd60549e1fe072827ea7f8e103c867411affdaafa45fb1596a7716f9912534e3cd3703d1b439a4d2e2864
-AUX vdr-1.7.27-fix_channel_names.patch 729 SHA256 5cad879662ba7961bd5ec518b6ab690fb10ff9c096c28940f0f6779a02f62a0a SHA512 781f916a069f518a808a205cb20e0cdc23f96127664f8ee91d4394cb472b8ba3f5307c0b1ea4c3a0f3b3aa6352cc92cc2a55ad416fa3029385292c6c6dc95d16 WHIRLPOOL 0eec9154abd9dad7d08f1cf012961eb5c05a2a34f15a5ebdb0bceb340af312be28b996baa47937cb3d4a19f8eab2ac931251faa9af7a3bc2ab90be33cde04882
-AUX vdr-1.7.27_fontconfig_fontsort.patch 566 SHA256 fdf75ca1f2f041eacb19974b27dfb21eece202ddde0a54a5041a85d1fa3a3f47 SHA512 d80b673de0a8b3006d7fe9119f890e2b280afaf5df06913a4c630d51e22441360dbe1b3d5e9aace737aa2d3a822bf3900d4b309b4b4a716908fd3f0dd527c5b1 WHIRLPOOL b47b8e7e9365a28ded979a7367d83902eaecab4e49cf4396799334b983f1b03708be9730f79d427a426b070973891c24e9568423e991d95e8b62521a4c064655
-AUX vdr-1.7.27_linguas-v2.diff 937 SHA256 d07252828f226bd8e63c7958629c4fe69102c32ffd884461dd803625b936a4fe SHA512 02dda3acc348f70ad9df6da52d27bf328d34b0d9a8da522590d688bbdbd0e9cbb565a2ec9ace7130ae6a7bf2daa89e64e23c3a2a3825f1cfbb1571721190c2bb WHIRLPOOL d0a57857979c41d5a27a09921c70a0f9c32cee703bb38d3e1286ed41c794873099691f97539c107f5d59b1c0f65d800c3fcdd79a879edf2aad9f7d7dfe774b90
-AUX vdr-1.7.30_parallel-install.patch 571 SHA256 732622f0961d4022ecfbaee3bdd48f42b99c5e8cdd4ecfcd269368143cdb9cb2 SHA512 a24c455160ec0eca9891f404de7f9a8074c7045453ce935e3c34dc7671dd46b6ae534a245fe1a9e62093c98db71b63e0eb81475b167e7b52f303396b4f8b2844 WHIRLPOOL 52a813da23d649179a94ec39a80a824eb749fb91b5b2029effcfd0560b316cd570dfec80d7a64e9649cfb5ea074fcca17b6375fa218831d02eeb38f2491dcc51
-AUX vdr-1.7.32_parallel-install.patch 459 SHA256 c900409f3b6875e1041f49a88e8c6bb25eb0ce0db8f05ba52904156abb9ac2f7 SHA512 87dc877859c304a57562da126a49e09f4187a445fb3ac228345b56120c8319107eea8757d41ef42d40d9447c74ce5623aa5bb88196de2aa514a4306f340eb154 WHIRLPOOL dead51be701d03c9dd9cf7bee4ce8838ce539f040de5a759a76ecbd41714dbc0600e56dc8ea84e542267e9c97953be60a82df6a704f8c427e43b56ba95b61fc8
-AUX vdr-1.7.33_parallelmake.patch 459 SHA256 c900409f3b6875e1041f49a88e8c6bb25eb0ce0db8f05ba52904156abb9ac2f7 SHA512 87dc877859c304a57562da126a49e09f4187a445fb3ac228345b56120c8319107eea8757d41ef42d40d9447c74ce5623aa5bb88196de2aa514a4306f340eb154 WHIRLPOOL dead51be701d03c9dd9cf7bee4ce8838ce539f040de5a759a76ecbd41714dbc0600e56dc8ea84e542267e9c97953be60a82df6a704f8c427e43b56ba95b61fc8
-AUX vdr-1.7.36_gentoo.patch 2245 SHA256 be1484e09147d621bc850f0c8bcd0dba1937b236d90cf1b2332dfc80bf5a3a63 SHA512 5ee996233eae88797e8a8aaeba8be3f784dc566c01711a4a6eb3db02ccf240696fa804e10dd75457b4035b0998d800816127a26d9c54a836696b1bc3608e556b WHIRLPOOL 5a63a93fd6f5af8491dcdac011b81abb3a75bedba915ad8eddc2ec42d41154b8b73a9ec861ac5bdfa06aa3786633b0479273453ead5d5b0ea53d1f481e1c2865
-AUX vdr-1.7.38_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec
-AUX vdr-1.7.39-fixutf8.diff 431 SHA256 74c33c81db03788171fae1d5a05edfb0b2d3acc0a86f0d60e328f078db8c0939 SHA512 deb5f0fc44bbb33139bbe428b960ec749451349ed0d5e4ca7bce8cab41dd300ea6c9b06d86f5db39d946099652ab27636d5696cfe49cd26aaaba1e6f5893658e WHIRLPOOL f3228e3c3c184186902be4eef7b12b2efdc4498623a2665c25f27ff4313d505b4026132100873830588d8d355e44efa8efcc582ea423abfa12403bf211c1bb1e
-AUX vdr-1.7.39_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec
-AUX vdr-1.7.40_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec
-AUX vdr-1.7.41_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec
-AUX vdr-1.7.42_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec
-AUX vdr-2.0.0_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
-DIST extpng-vdr-1.7.23v1-gentoo-edition.patch 572319 SHA256 ea8347fe4bf07e2b4924febb28018df9b3ebfa0ff73564c7dae8d32d35162a7e SHA512 8c0d636fa9e0c205a34631f6f7eaa3ff2a3ab3c9d612d4cde244c61e8c5eecdf978e63aabb870a5c3e03752279ee26ea73047dc021e2422d5e4a75a646a12a75 WHIRLPOOL e62c52f63ba8d29e3c26ac64c9f2a70b2fa881c716969cd6d61d21c54021663ff47f1706fc870d52789e95aebf1d9ae9a42cdebacd32e343b5d99bff4d7b3460
-DIST extpng-vdr-1.7.24v2-gentoo-edition.patch 445832 SHA256 a5646c64530ebc9068a95f51e61803f49b248b97605a09466e027c97d75730a5 SHA512 d65987d4eda1dce6da0f9f161b8cc46e66678925023171a6d1651dbf834c0e1c3205a5252f93722ff17ea0eb2d73b17bfa338f67b29252c8567007220d1abb2e WHIRLPOOL e6c8a19221f4866e486ecdcf844a63c47491946c85691b8024efaf023bffd8de58f671445e3fa63b3207e53e4da02210aea7f141d6a12dcf02cd768ef799b721
-DIST extpng-vdr-1.7.25-gentoo-edition.patch.bz2 73764 SHA256 022e5c793f806164f9f1ae4da253db6a1dbcd997241d7523ce489040bbab8fb7 SHA512 103a6a5c8583fc7d77b4b1a3932c7b6b8f70a334384e8798ec8ea946b344610b21aa042eceeacdf5b7ebcec0e720fb124b0c0d8558fa2ec618b1299d56206fbd WHIRLPOOL d7648f5bbab307a97d4d94ba6404e05e6039a9a7f44bcbe5bbac9ff1867ada17401189323cc310fdc289154802e3d6e3e21516b35361140628487cee257ce927
-DIST extpng-vdr-1.7.30-gentoo-edition-r1.patch.bz2 79590 SHA256 a6c8debdf2af03937009b701d2f1dfecb1250f263fd36fb69bbfbdff1900fff8 SHA512 da9b56702ebbf77e69f43804b09f5b13a940d13a720f1954f2a32905c74c2c0fc7d3c5a368755ca22ba9cb0fee564f02053dcb1a38968209f63fd1b56d4349ea WHIRLPOOL 0f8b91bf02882dbeff221e4534608c03719041baf6958daf57976db450bac57ac187c830a59f3452da3a25072da43f2588f744d92658396945d2b3e1c8c308ad
-DIST extpng-vdr-1.7.31-gentoo-edition.patch.bz2 79540 SHA256 fe242ac68aa7332f41a83d01ff8da9026b396253512693624f5c689234dffc0e SHA512 9329028d4b2db446ccc1ee3a92c08b28f4d2665744166a4761b4973542f21e113448f58cae708694431499778d9aedb4f8e52fc2e8f882f7fdb4067c4e1a62f1 WHIRLPOOL 92903212cfc877d2035d9723051bc244af1b51691a207a29d9e4af9e557617f5b3c5bccafd8740642cb0b56d788b7d449226b843835db0d4a90d802061efa882
-DIST extpng-vdr-1.7.32-gentoo-edition-v3.patch.bz2 74329 SHA256 499bf27631b521713efd21c6e3912e094c086118e134bf51e8b1c6f29ed67cc3 SHA512 42ba0024d581042a09442a1dc9dfdde550cfe56cef8b1b17a00ec3016ba1eacd7b7ca1c916403a4bab6d3b1a90069317e0a0308107f9b36f99c6d014833c251f WHIRLPOOL e29a513be5994ca4d9691eed74d404c6a2d534a76d7e6ff00f5c50b113072e0b6fc8316ed4ead0d4913928e2474d54a5e437548c4d64d5d9c73735ed9689679a
-DIST extpng-vdr-1.7.33-gentoo-edition-v14.patch.bz2 70210 SHA256 6c58f27c1fa4538e955ef66332de86c75cda5327cefc162e98ff6f1ca37fd0c5 SHA512 bb8e6667092490e0b8712d414b3473ad743bc19a0355266431f7da86afceb88e6759d3dfa7d2705ef5a21ab5cc23b7d266e3f534b2e7903972dc33446dd8118c WHIRLPOOL 1c1e2407c1d0c238c8fb43340cb1caff11187ff33d95cebf0eddf8075c9f075ffd3204108f7de164b32a21b43ac251d58b652ae7211bc087375e7b68033bc497
-DIST extpng-vdr-1.7.33-gentoo-edition-v18.patch.bz2 64830 SHA256 7b57767cd179a103797147c7ee5d1cd4b4a9a6c26b8638adb4e8da22c00e5f02 SHA512 6eaf85ca9bff0f1692edbda8242034f8ebd0ad4fd8a458c3f75bf294b2505dada2be126fcc21df16ff842d41d7a43db133b816e4101ccb9e8539aaeb9ce3f2fb WHIRLPOOL 90a7bfec9da31add0a9ab8024c0b71488d97f488680866edcfaba59667662d77e80e079f6a3e55f994c78899cb2335cea5d6b3fe6a0bc5ab1d5f5c945eccd611
-DIST extpng-vdr-1.7.36-gentoo-edition-v1.patch.bz2 64699 SHA256 4fcc238274844ec4c1ad61067914d836302663a7fbbb33a958c2334550731a48 SHA512 1fbc458107d9b642e1ad79f47e95cb524a29b0da6b9dad6b19536a7702beb02e2fca564a743283ab15f86176e3689a9baaf09090655c5b523e6c420ac59c2747 WHIRLPOOL c32a357dc3a9d8e916b1047a0ab334f51e10b2474cd22042b26fe3c53c21e002967a5eab1e4cbeb656ce26a12eb195f713ea2b32d631b4bb1f68b363bf10306d
-DIST extpng-vdr-1.7.38-gentoo-edition-v5.patch.bz2 64748 SHA256 1d03eee87b2db57efa3548f3af5545d7b0ad3ac31e1717842688d1448ba4d0ab SHA512 3f9cb903391315c9d6b89ed9ad8970d01e49046f0b6ebf632a7300221715d686340aa1ece186b7bcd9ab3b944822208858647803f3f46b8bbe68d42320a1cc2d WHIRLPOOL 34fc538da9405666fbfb64871597c7dfa055f84c54e5638a58a20a6a0b8819d2e44edf19008746686da6209fdca91634cdbb7c1c80fd57b4280e126a39ac845b
-DIST extpng-vdr-1.7.39-gentoo-edition-v4.patch.bz2 64155 SHA256 0fb6f8927bc215bdbfd2e41a8c5018eebeafd87f2caba4f7aae0972e3716eb33 SHA512 2d5160390cdf9edd480e02c3ea74dc87b54aff598a95513780af803d69b1ca1e028852ee69697f51ec153377bcf76bf6f779e4884f5d5126365daff0ce415430 WHIRLPOOL 37b36279c93d8190a4dfbb4c89b9f13922a8e1d9685652b7b74159970a9384665859e3adade7ee0cf3274eb94decc4c601054b037631d333130f3a15c9c5b03f
-DIST extpng-vdr-1.7.42-gentoo-edition-v1.patch.bz2 65000 SHA256 9cca4dd7885b129b311263744d074d8351f52fc52312bd17f9c7a038bfea94a9 SHA512 7aaaadffd324ec4aa6287de693648b70782c87ded16533c62bf9d78ce28433d4b19e5bb7dd45891b57be19dea3e72dc9c5259e9bb9a74958bcd5f2f2a7a0f5f2 WHIRLPOOL 06335cb030a31051d8b444bc3209ed80551535862d4580491d9339137e0da559c5cd85e69e798a9efc19fb3bafff393bbcdb6d99cfd2b45f5f2ffeb13a16929f
-DIST extpng-vdr-2.0.0-gentoo-edition-v1.patch.bz2 65000 SHA256 9cca4dd7885b129b311263744d074d8351f52fc52312bd17f9c7a038bfea94a9 SHA512 7aaaadffd324ec4aa6287de693648b70782c87ded16533c62bf9d78ce28433d4b19e5bb7dd45891b57be19dea3e72dc9c5259e9bb9a74958bcd5f2f2a7a0f5f2 WHIRLPOOL 06335cb030a31051d8b444bc3209ed80551535862d4580491d9339137e0da559c5cd85e69e798a9efc19fb3bafff393bbcdb6d99cfd2b45f5f2ffeb13a16929f
-DIST vdr-1.7.23.tar.bz2 761767 SHA256 1d1c25e66f51c5489ed0238601002c7ffa9ad5c666f45b51c311fa13bd018c0e SHA512 206616a09a0cfb494426e3b9800f45c3341c6df75ce806a059c975b0edcc33027fd3c62c5e1c541ef798d7af2922dd0d24dd038c437939869c89d5a0ada3cb19 WHIRLPOOL 4b268220b9a3047a8bb9d8eac31455f3b9b5c4f6587c86e5daa4c31bb2f3d6c86296a7827acb8bec7d73caaaed252b6102fadb92054368e1d897c41ddaa6351a
-DIST vdr-1.7.24.tar.bz2 765472 SHA256 a1209612c69bab9bd37078b65c5da26b1173f075aba742acb6dc07303beb97a8 SHA512 87ea0d107eae8d363920d311994daec63b7820fbebab422052f4cd4ba22fa147d4aaaa7c000e0d42dfba2e3ead768d254b173e1bb793f803a1b05add5c9c23f1 WHIRLPOOL afef1e898a5d1620faa46cf31d575ca34034ca80b04399ea2b59ece8e92b039bc5431c89d4e2924e8ccb0b7de9755946d1c79ac6d4c819d8dd87a088af45c319
-DIST vdr-1.7.25.tar.bz2 768334 SHA256 3e5438ee46e32cdfcd074bd55246965796d93c33984be3b2a21e51983ac48cf4 SHA512 92d1a29edad54eecd1f2f75e48e6af4b14fdcf41902284db56531ee979556377a1f7f7c0b0b67b17559644a43f3b0ea79df861d55a8be4ea26435a605bfeb684 WHIRLPOOL bbcc610ad4bae9f429aa7ecd8638fd3c840214300b1181a508c1ade660533e33164613a043146a48d01759087f12353108be6215a6d965c9329e85c025b23414
-DIST vdr-1.7.30.tar.bz2 787988 SHA256 ab9b59e3e8922c72803e047d91935f0a0836d51b5c52508359c0fb46b3757b3c SHA512 98db63d708e1bb5560a920cd4be7cec31bf0d80ef1320f83d9a323b8237a5fc410d4b2f3ccf899171b6fa4cfd7f323e941461f157b850a3066ef0a0087cbd928 WHIRLPOOL 095ee530673da6732ffbea3ead6cee08be4bcd9ab364b3b0734d3b4314fbaa3cee21b171e5366c4d648dff5eab4e41ecf51e18f82fc8b3b1ece547b88ab8916a
-DIST vdr-1.7.31.tar.bz2 789706 SHA256 f7abf4d3a44e53e79877fdbead150029531e7158267e9ff6bccb861c92652f35 SHA512 67253f6cfb8cf6df24cf581a80c219a1a52b9ad4ce959c09506d7fa27ab383801b0bd390ff5a75900368d5427a075b70ca63fc0a31e930880283434e23da3c1d WHIRLPOOL 10d4414944e8f761f6b01fe2b06398128c6f134b2d2e32c38b5949f6c08edcfb185450595ff430f14262dc6fef91ace76ada2b649dbb4cedc843847c9cc32b4c
-DIST vdr-1.7.32.tar.bz2 804400 SHA256 aff2fb8253c62016215266526961eda49f3a14eb08e28f82fcefdabf403da1bb SHA512 e275479fee193b3406844fcce7b19c39ec335f19a82d158196e149ffb27fdc0739812431ce4b2fc4515f5559267fb675eda5c3f3c10311bdc9496606e5e3230d WHIRLPOOL bd355e297985b46ac78b06eff4cb62a8d3d0e799682e1cefff4f3117f774e0db2f5cb0a02116c84c1fae009045ab2c95cc3444db34a7e0aa7aa1cee33d018310
-DIST vdr-1.7.33.tar.bz2 808222 SHA256 1ec953059f9408db9230c814c4eaf565aa85f7f75e78b1306ee4d0520e89cc54 SHA512 2d416bd22b48359f0119a41f9919babd425fa70ed83f0918debdd5bff4583384a13409beb1fa87d2e8253f6c6ddc70346e7e76fcaaac92391de0f3645ace098c WHIRLPOOL 9e38567afb8364af250cb92ca6e87abebcd0688b7b2f907fc7afde9260c3e63058a5ab238c14b62de810594a08522069d7b005e8fb19fd80ec5e13ba76048ffe
-DIST vdr-1.7.36.tar.bz2 810216 SHA256 aa4dd42fe66670ee72725c666a82e96faa44148226c84380090b3964c630c74a SHA512 5eeaaf4632e94a5fa8a751fb6eb380c2b8e116b4ba989c27d34050cdb505ef0b4cc5a80a902e14982d4f6e3172bff9364820d75f9a9bacd7a4486b19f31d7fab WHIRLPOOL c7a6976c470613a34bfbb1bcf983500d8974df1d0737b396d796c0d14ec6d8eeddb0e8acf51ce227a1fe124b20022eec07c1a0e3650f6dfa600aecd98e25a8d6
-DIST vdr-1.7.38.tar.bz2 826458 SHA256 bb37ff764b208dd3eee3a66df6e3225490d9ab9dfd4e2a99961fc94375dd5ff7 SHA512 100b3e9f75dde11c1cbda454899608259596ba2a657e04cfdf30c17b5cd676687d78d47bdbcd6da5fb912ab8066d8732238af788b5d04a23c8b59142a3d20d4b WHIRLPOOL abe1b03317437deebc719275b0506e6f616feb0dfcf4120ebe4d63e3454fe2dffd53decf2da3ae12ea70015f68ead0eb47ad2fb3c7cebd129af59d6a8a684616
-DIST vdr-1.7.39.tar.bz2 832445 SHA256 22d9036048fa1beed19db9218057304807b0d02d3cf1e3825901560afec05be9 SHA512 f050e726cad096dd48eb73010f6a24db87ea5aaff4e20f5184670ed13c824cbe2ba9ada756e418fe9a5a801f0b10c20158f0ad8e33cfee1216c8b9d97e85bba4 WHIRLPOOL 6fa8e3dc73bacbc944b7de6a0160843ea8f245041ee3d98d9a89e0fa7aabaf092452efe5ce0e0a26b79d1f475d29f106d6c2c5f374848c849c9cf84196262714
-DIST vdr-1.7.40.tar.bz2 835552 SHA256 295f4b2df6791d9001b9fa63a8076dfee68490f23d204c9295c4d89e6f50c165 SHA512 fc02b8d4605c88f0b031a1d0b77e337d28516d826cf133e45065c1dfc237b6042bbb9172c31914dea021a9f6752563daea350db038e84f30772a24e5f289fdff WHIRLPOOL f550ab4a9581e155fe7904a0952bbe222c9c235ed27152c561cd047451308230a653615fdc8458d1f83862724f59316f8b9c2918c7a1a5196fed30035c1a498e
-DIST vdr-1.7.41.tar.bz2 836810 SHA256 3b071c10bee5af202f1bc2967a8441d8390c3493baa1d547a64cdf16460e4995 SHA512 0ef1d7f05a6a1fdaa7c078e8311b8b461de0310a95a56d5c3227403ebafa49b93aa4119c5ea7ced73f27a7f5e486d74b29d0703758610dd483b8ddda0a7294df WHIRLPOOL 35992365b11879fc41012cf59c365a57d657377a247888866fd1f4cf1e9cb58807f88b60d06cfcc2712af93c97ae58e1389446caf6065c71d96665a7cc656fcb
-DIST vdr-1.7.42.tar.bz2 836794 SHA256 1d6fb1e84a2710dab14c07a0500e348efb534718afc4c6843cdfe806800511a1 SHA512 8698e16674e5b1c4825c14356ff23c123dfa03763fed198c302b7c71cba877b674663a82a17448f532dea7a46826eef8864d5a5c4a06c95a7839516417e718f4 WHIRLPOOL 209a15cd4e4fa625a078390e4e476738187b6a541071b7b2ac37b4946ab9bb90ee3a7d8325c843257f4eb4a8881975cbb1c2c4f68f97259730cd9a1920320a3b
-DIST vdr-2.0.0.tar.bz2 836700 SHA256 09bc0e68a3b0eeffc3d7363060ed3d7ed2759e6eedd5abc03b99fced8a0d2897 SHA512 effc99463ac8e8352bff9bd934f479210ce589d496c0887fdd2d6bcf7e087254dc7d048e2b1e88a38f3093fa56061763aa4bace6392fcee0bfdac7a67b563b4c WHIRLPOOL a2ac0632cd6e9b2e77c729180230530e2ffc21b22a9d732daae4e5016c7e5e9c0df24dda1c8ba46692d57eca5109e57d206e03088fbbd5848427014ae7bfa456
-EBUILD vdr-1.7.23.ebuild 11086 SHA256 8159dd9cb2115e96eb24bf18a1aa95e3cd17fd11ea1df2bd1b021cf36defe0e5 SHA512 67b294bdf481f8f67794679347c1262cc6234bd7e219c52b3b5ffce5db7a387246bc617d098cb1e30881eef1e440a9ec5d624388e79816b61c232f27465b76ee WHIRLPOOL 955b29eec06c34b2a0dc248bb1b7b8ef73a00c9b5b076b103e75badce172e2429119b8ae4a7f17abbf9088cfb63fac5dddacadbe33cbfd55156305bda2b1fe24
-EBUILD vdr-1.7.24-r1.ebuild 10006 SHA256 f45133c1aaed00ec40ac734c9b4e8bb489b697211716875cd7e74e8ace88a91c SHA512 b645147ec6721d43d22891d604e39d4c1f6db2f8c76d69690c9cf72ca1aa1744f894107d7bb8ca6c5688977b06e6a38a76bafcfeeea133ed487754423f321f32 WHIRLPOOL a6df9b007268253946cadcccb979fcc76348dbc8a215e76e3e089056ff49317581a5a69d258832e35dfb2f0d347fcf57983aa6c27a2906dd305ebcbaba8d3e2d
-EBUILD vdr-1.7.25.ebuild 9961 SHA256 3817f91da7c40a246f48d14cefefcd4c029364da3da835616f16a2faeb4d155b SHA512 7806049d2d92be599d0ce103e1e2c5233f8411a389e345f291a8205bd7a4b7984d5e9c81a93cf2bb3db834fae4b4ea16cf0f458a09481579ad7e6e5eb83a8d39 WHIRLPOOL cc8cef1065e4f0c87bb53f75df6cc8c792e09734b094b9b38645a5f66da3b757ead2c86d638bd6fd8a201c7563921de46072ed66015834617def33c54eda4deb
-EBUILD vdr-1.7.30.ebuild 10769 SHA256 7ce2f512bfc479309a35425f4e4f35b1bed473a6901cab699951ed63e7429f69 SHA512 9e412a81300155c2f2c9313f148feac3d6ad51149aa70fa2c620b47565bfbf86277d1214f6f72d95424d6e08528ed1e25af2a4e12232021dd57eb367bf4d75c8 WHIRLPOOL 565a29573b5a62841bcd2d2f9ea52cd4f5d9b3005fc6420118af2412be9eb043c0074db8f6e9487e16cd30ff7cd7f3937c9cf8ab28cdf583de60dd6264aea015
-EBUILD vdr-1.7.31.ebuild 10774 SHA256 d1e039c3415ee668298bc78a14018f19dda6078b49d3c48f5d4fdbd3c885a180 SHA512 67bc9953289888b02ffba20c70af43e06b9ceb7d97d130854fb0ed26e9d14eb0946793bbcd9bdc62e063ffaae2854c86e4a158925930e6b545ac75d55647f0c0 WHIRLPOOL 65bbadbcbf6b85776572ba21a7556f5989f1f0244548e91a7eee175d173962882c116977a8ea4bf5052520e1d72c2581cb1389983754793df0d32a683837c771
-EBUILD vdr-1.7.32-r1.ebuild 10697 SHA256 de0d2ad92e6f81d40d00ef508232fd125fb17312576d1dccede608cae8103a34 SHA512 3f66ef887573ba927c35f919656042844ce023ea6906447999648b679e894cfdccab0eb2dafeac6c215a8ee0cc8cc51ff6df9a2513b515eb6b524fbc801842b4 WHIRLPOOL 14edfa8d5b5bbffe0766ad5728c32463b644806770f23974b9a33da8c0b01883b5148a24446ebd4ae90eff794c4b3f1247065313c0e41b5242d3c2104c19f0a6
-EBUILD vdr-1.7.33-r1.ebuild 10561 SHA256 adf2b441445a4133d39267f854e9ab6c3892b1bd1ea6799445cd6c9285b64816 SHA512 b3c13b42c2d2effe03f88b1de52a928a7227cec9d146905e60c93feed8c2dd60e75fdb3215d6b718cf5e52407264243e848ac630efd1ad7fa11f025af31df5a4 WHIRLPOOL b7a6ce5a36b29058615a5417adb7bfe70146f1299e4a70fcdcc4ea1f901f8fd20bd81cb50236e188ffeb7649fdc490f4b57498477f3e3324e12f4794f71d4854
-EBUILD vdr-1.7.33.ebuild 10577 SHA256 298905730268f0bd0af138e6c9b3b437dd57647a644169315a3ba235f6c94ffb SHA512 5c6ce568c2b6789f10eaa2b39d65045e707762c39580955494a1f6de4c700829056e578bd2a1e46c3b0f9b2788d5c6e422a98ab4b6a7d20002070b0ef2bc5ba4 WHIRLPOOL e3bb776885fe29b0fae6b2240b8012e6a1366da4c016951827489d931f152e62170e1f5ea9aa3156cb81a34984d37181374ae8295c5e915a238cf3a392dc609a
-EBUILD vdr-1.7.36-r1.ebuild 11566 SHA256 697e80e5c371d061ea6dd3d381d9e288a1972d37815e9f7b048a4a359bc0a9be SHA512 adc3851bc3528f918d86ba9e3f1cefe46fc735a9d53de53abd13837b5cdf11968a382ef2911313c7b2a16b7bd75a2488a715bbcb38c1939d0a72b99be5120524 WHIRLPOOL 6210770e6106ad8208740282464c235db684aa7723d5880de59b89a8cc022323e1309dd5d92decec2c3b6ec89a74cd28336caeadc32baa45a89a1755c868eb4b
-EBUILD vdr-1.7.36.ebuild 11014 SHA256 16df3019cb460a70ea1119ee616530be895fd0f4ce9630595b2e2444cbc64fe7 SHA512 3a8ff3700d2d5a011115d89ada30d346f83c899cbe5edf61a14a8f9a28195047bc8bf03f17316f045eb6e89f91494d1e18f585d69575c9c37122fb0890aba0e9 WHIRLPOOL 5784447a57b29c7f680d02318d2e10d25f6d69581582afaf07f35fa6d5b8428a3cf5123625649fb150c052599ee8381ff1d9aadb6cf3f3048c49807222559a76
-EBUILD vdr-1.7.38.ebuild 11982 SHA256 c72615a993a26afa0c8c13882edd72abb565b54b08c1f2accc09dac04d4cf1a9 SHA512 420f3ceeae5d5c72682b57f8d6a7845b471f2d924809226f6bf320a9fea3d79736c6bb7c69e522bee42332b58a5ebcd833cd521eb44f6a862fb4b84bd036daa5 WHIRLPOOL 5b8a48aa7e06a67c5897f94d3bebdec47345646fed6504fbe782273552a1f28e282d035d83f17266e7fbbc78ffd705d797ad9fba04b915107148c0aba9115c09
-EBUILD vdr-1.7.39.ebuild 12028 SHA256 33a6413ea715be0b9e529e22023217b0876b7ae94f4db18ca0b645d6504f8a29 SHA512 c5791bfcad9acc36eb801e49af8d67a0a3b3b4b4e5f102be1eab987c25306a9cb6a753b13759ab1c54a55834d601f2a8f494eb32826cc7be1eada0d3149019ea WHIRLPOOL e363377349ea35c6dde5f5bad4ba8792c00a6aedde0f20dea4725fc4b2bb8cc458876c1fb5f719ffe5efe83b6d8e688644ffb8afb34ab6f80d09129f6a98303b
-EBUILD vdr-1.7.40.ebuild 11641 SHA256 3e17c3fe0fa6989cba49448bf2a36a8a89702c7adc9a28dc6cb023b899372521 SHA512 81b63e0d71661885d5a1f1543c2f2b317173e018f09d06cf02b221b79ae6a3df54818bdc900cd072cd698b4c91dfa86caedc35e0015cf268e921ac327af746d8 WHIRLPOOL dd3e5637d3ddb0eec9f08e64a58fc0eaf642bf3ebc220ebd4154d0531c84f7b208f3cc2ea3c349b5a8eb67ed1c0f3ba5010bed716304730d80afcca3993c0767
-EBUILD vdr-1.7.41-r1.ebuild 11479 SHA256 9aa1b0c5a3c754fc08f99dce5cc128029b39bc1ed49f64e39a63eba46f818588 SHA512 1404d3d7d5c4c4a14ac11081831f21d0c7868ae652f9e43d9a2a5e8ad84d7113e8a715c1a7495ce1b80fb7910a26d10f7c0fc7d28b36d3e230e327b753d08ffe WHIRLPOOL ff9f4adb970344fa2645a40eff0153df7e0f685cf2481bc59f3cadc731f07fd7157bc2bcf2cdcf1dd31c5bd4fb3542dd3bdf7054e6b7162160866a8ec84f41f5
-EBUILD vdr-1.7.41.ebuild 11647 SHA256 8bc8c29d58f42b540233bcfe48fbac4cc9d43b6e24b65884acff6b5ada1dd483 SHA512 68caee08f773bfa4905db11608902cb8b7152fe1ac4bc8663f469331db21cc1347b3597d924cbb2d2c1bbaff7bc19564f16c06e1f538ce85c1177728ef1ec0cd WHIRLPOOL 7c6c244a3b60031820714e2a84c83cdc5d48c2532f7f01de3d8a6b0f40517c4382782969436ae148411fc9be479c15714dac0933d82ba15a5ae47f812abc33ab
-EBUILD vdr-1.7.42.ebuild 11094 SHA256 9a9392d7c03b65146fb55a3f37907b6af5ee047937bfbc8c059b14600ff42e4c SHA512 c947238eafe2acf10af6499da3d9f20f988a0f20bb8d896ae5443866a32840918931ba9fd4cffe8fd7958ea8fee6c30e59c972d6685a3a1150f03d7e7ef7f8ac WHIRLPOOL ca88c6913b349495bc70a9c61c07b233741a89e28e70b9cc045a204be3558277a3341a2e4ff24ee43535d1fc70e8762ecebce68073c653f5bdea0baef53186f1
-EBUILD vdr-2.0.0.ebuild 10307 SHA256 c63211841c881ec1ae2289f9fc1108e5dc124242c74f53a7a76758753c2f8c0f SHA512 bd5fdce711095ee97ef23c8c6cdfa7c50c04b3382608dc1646c242f58fb5e8aa17ba94fe1f576967ac766946b0d53795ee0e5ae6305d6ab9696ec5189e09fbc8 WHIRLPOOL 87e19e486aa6ba2388c483263fbab3ba8472a08b8d9ab50ca493070d8ffe2312d8ba5e1dd6c49e88def21d4c6f3f60d426fdf5867527c854c7ce0234dc12ae12
-MISC ChangeLog 23849 SHA256 b325517e4f0da4b6ffd23e7d4542a6831f9c1fd490a7b7e996ff423cde2b34f6 SHA512 3b90f5e89b550970d53e3097005189a05579c2297538a146d39b4dbfd091f7d896c6b26d3cde73b285dc3ab35fc4d9827f6edb140f4fffce61b80f07c36d2047 WHIRLPOOL 6e024cc75d3c0d249891c5eb9da7c8ad12b9fdc3efe8c0b7a9246bdeab3c3a0ca47b8397d2416e7a94152cf2d6c1b84108e14bfbfa74553cd9ca99c5a2b674cc
-MISC metadata.xml 2515 SHA256 0d1b116cad16c232a26efa5625f5bfc0ba3f07cd32094a3cef923ec2dfc1afd4 SHA512 9f23733a73575a7998abaae511dd6aed575a23ff2c9026599f85a7f0d00e5dd242bb3404078c4a9ae4d7a98e2ac9a88d055decf4f4a16c320937a15bdff9182c WHIRLPOOL c4c6ef51aa50e3b21a2b929d04a400b7ecccbf508ebc5bd24e006222aceabcf7b03bb7b1ef76fd6866953845fba5519b5e31c04aafe15c70196db1f7be56b953
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
deleted file mode 100644
index fef8bff..0000000
--- a/media-video/vdr/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>media-tv</herd>
-	<maintainer>
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<use>
-		<flag name="html">Install HTML documentation</flag>
-		<flag name="alternatechannel">Use alternate channel on record</flag>
-		<flag name="cutterlimit">Limit IO bandwith used for cutting</flag>
-		<flag name="ddepgentry">remove duplicate EPG entries</flag>
-		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
-		<flag name="dxr3">Enable tweaks to improve vdr behaviour on dxr3-cards</flag>
-		<flag name="graphtft">support for grapftft plugin up from vdr-graphtft-0.1.7</flag>
-		<flag name="hardlinkcutter">Speed up cutting by hardlinking unchanged files</flag>
-		<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
-		<flag name="jumpingseconds"> </flag>
-		<flag name="liemikuutio">Formerly known as AIO (all-in-one) patch, adds some nice must haves</flag>
-		<flag name="lircsettings">Allows to change lirc settings delay, freq and timeout values in OSD</flag>
-		<flag name="livebuffer">does timeshifting/background recording all the time, allows to rewind live TV</flag>
-		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
-		<flag name="menuorg">Enables support for the menuorg-plugin</flag>
-		<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
-		<flag name="nalustripper"></flag>
-		<flag name="noepg">Adds code to selectively disable epg-reception for specific channels</flag>
-		<flag name="permashift"> permanent timeshift by recording live TV on hard disk, need plugin vdr-permashift</flag>
-		<flag name="pinplugin">Support for pin plugin</flag>
-		<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
-		<flag name="setup">Enable support for the plugin vdr-setup</flag>
-		<flag name="timerinfo">Show with chars +/- if space on HD will suffice for a timer</flag>
-		<flag name="ttxtsubs">support for ttxtsubs plugin</flag>
-		<flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves</flag>
-		<flag name="volctrl">allows volume control using left/right keys</flag>
-		<flag name="wareagleicon">Replace original icon set in menu</flag>
-		<flag name="yaepg">Enables support for the plugin vdr-yaepg</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-video/vdr/vdr-1.7.23.ebuild b/media-video/vdr/vdr-1.7.23.ebuild
deleted file mode 100644
index 420ec70..0000000
--- a/media-video/vdr/vdr-1.7.23.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel cutterlimit
-	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg nalustripper noepg pinplugin
-	rotor setup timerinfo ttxtsubs volctrl wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}v1-gentoo-edition"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~idl0r/${EXT_P}.patch"
-#		http://vdr.websitec.de/download/ext-patch/${EXT_P}.diff.tgz"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	dev-util/unifdef
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-extensions_all_defines_unset() {
-	# extract all possible settings for extensions-patch
-	# and convert them to -U... for unifdef
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
-		Make.config.template \
-		| tr '\n' ' '
-}
-
-do_unifdef() {
-	ebegin "Unifdef sources"
-	local mf="Makefile.get"
-	cat <<'EOT' > $mf
-include Makefile
-show_def:
-	@echo $(DEFINES)
-show_src_files:
-	@echo $(OBJS:%.o=%.c)
-EOT
-
-	local DEFINES=$(extensions_all_defines_unset)
-
-	local RAW_DEFINES=$(make -f "$mf" show_def)
-	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
-	local KEEP_FILES=""
-	rm "$mf"
-
-	local def
-	for def in $RAW_DEFINES; do
-		case "${def}" in
-			-DUSE*)
-				DEFINES="${DEFINES} ${def}"
-				;;
-		esac
-	done
-
-	local f
-	for f in *.c; do
-
-		# Removing the src files the Makefile does not use for compiling vdr
-		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
-			rm -f ${f} ${f%.c}.h
-			continue
-		fi
-
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-	done
-	for f in *.h; do
-		unifdef ${DEFINES} "$f" > "tmp.$f"
-		mv "tmp.$f" "$f"
-		[[ -s $f ]] || rm "$f"
-	done
-	eend 0
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-
-	sed -i i18n-to-gettext \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-#		local fname="${WORKDIR}/${EXT_P}.patch"
-		# most extpatch are full of windows line breaks
-#		edos2unix "${fname}"
-#		epatch "${fname}"
-		epatch "${DISTDIR}/${EXT_P}.patch"
-
-		# force to use shared tinyxml for use-flag setup
-		epatch "${FILESDIR}/${PN}-1.7.22-shared-tinyxml.diff"
-		epatch "${FILESDIR}/vdr-1.7.27_fontconfig_fontsort.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
-	previous_less_than_1_3_36_r3=$?
-
-	has_version "<${CATEGORY}/${PN}-1.6.0"
-	previous_less_than_1_6_0=$?
-}
-
-pkg_postinst() {
-	elog "!!!! WARNING !!!!"
-	elog "  ${P} contains large changes with respect to"
-	elog "  how it handles video streams, so expect this"
-	elog "  version to not work as good as the versions before!"
-	elog
-	elog "  We strongly advise you NOT to use this version"
-	elog "  on a productive system!"
-	elog
-	elog
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
-		ewarn "Upgrade Info:"
-		ewarn
-		ewarn "If you had used the use-flags lirc, rcu or vfat"
-		ewarn "then, you now have to enable the associated functionality"
-		ewarn "in /etc/conf.d/vdr"
-		ewarn
-		ewarn "vfat is now set with VFAT_FILENAMES."
-		ewarn "lirc/rcu are now set with IR_CTRL."
-		ebeep
-	fi
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	if [[ $previous_less_than_1_6_0 = 0 ]]; then
-		elog "By default vdr is now started with utf8 character encoding"
-		elog
-		elog "To rename the old recordings to utf8 conforming names, do this:"
-		elog "\temerge app-text/convmv"
-		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
-		elog
-		elog "To fix the descriptions of your recordings do this:"
-		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-	elog
-	elog "For Full Featured DVB Cards you need up from now an externel plugin!"
-	elog "emerge media-plugins/vdr-dvbsddevice"
-	elog
-	elog "use-flag ehd removed, >=media-plugins/vdr-reelbox-14440 will compile without vdr patch"
-	elog
-}
diff --git a/media-video/vdr/vdr-1.7.24-r1.ebuild b/media-video/vdr/vdr-1.7.24-r1.ebuild
deleted file mode 100644
index 644a3f0..0000000
--- a/media-video/vdr/vdr-1.7.24-r1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel cutterlimit
-	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg nalustripper noepg pinplugin
-	rotor setup timerinfo ttxtsubs volctrl wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}v2-gentoo-edition"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~idl0r/${EXT_P}.patch"
-#		http://vdr.websitec.de/download/ext-patch/${EXT_P}.diff.tgz"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/${PV}-time_shift.patch"
-	epatch "${FILESDIR}/vdr-1.7.27_fontconfig_fontsort.patch"
-
-	sed -i i18n-to-gettext \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${DISTDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-}
-
-pkg_postinst() {
-	elog "!!!! WARNING !!!!"
-	elog "  ${P} contains large changes with respect to"
-	elog "  how it handles video streams, so expect this"
-	elog "  version to not work as good as the versions before!"
-	elog
-	elog "  We strongly advise you NOT to use this version"
-	elog "  on a productive system!"
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugin 'dvbsddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.25.ebuild b/media-video/vdr/vdr-1.7.25.ebuild
deleted file mode 100644
index 764fa37..0000000
--- a/media-video/vdr/vdr-1.7.25.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel cutterlimit
-	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg nalustripper pinplugin
-	rotor setup timerinfo ttxtsubs volctrl wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~idl0r/vdr/${EXT_P}.patch.bz2"
-#		http://vdr.websitec.de/download/ext-patch/${EXT_P}.diff.tgz"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/vdr-1.7.27_fontconfig_fontsort.patch"
-
-	sed -i i18n-to-gettext \
-		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-	doexe i18n-to-gettext
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-}
-
-pkg_postinst() {
-	elog "!!!! WARNING !!!!"
-	elog "  ${P} contains large changes with respect to"
-	elog "  how it handles video streams, so expect this"
-	elog "  version to not work as good as the versions before!"
-	elog
-	elog "  We strongly advise you NOT to use this version"
-	elog "  on a productive system!"
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugin 'dvbsddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.30.ebuild b/media-video/vdr/vdr-1.7.30.ebuild
deleted file mode 100644
index 55c21b5..0000000
--- a/media-video/vdr/vdr-1.7.30.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel cutterlimit
-	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg naludump pinplugin
-	rotor setup ttxtsubs volctrl wareagleicon yaepg"
-# timerinfo temp droped, need new version in extpatch
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-r1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~idl0r/vdr/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/${PN}-1.7.27_linguas-v2.diff"
-	epatch "${FILESDIR}/${P}_parallel-install.patch"
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# some new improvments for LINGUAS handling
-	einfo "\n \t VDR supports now the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-}
-
-pkg_postinst() {
-	elog "!!!! WARNING !!!!"
-	elog "  ${P} contains large changes with respect to"
-	elog "  how it handles video streams, so expect this"
-	elog "  version to not work as good as the versions before!"
-	elog
-	elog "  We strongly advise you NOT to use this version"
-	elog "  on a productive system!"
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.31.ebuild b/media-video/vdr/vdr-1.7.31.ebuild
deleted file mode 100644
index c2562be..0000000
--- a/media-video/vdr/vdr-1.7.31.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel cutterlimit
-	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg naludump pinplugin
-	rotor setup ttxtsubs volctrl wareagleicon yaepg"
-# timerinfo temp droped, need new version in extpatch
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~idl0r/vdr/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/${PN}-1.7.27_linguas-v2.diff"
-	epatch "${FILESDIR}/${PN}-1.7.30_parallel-install.patch"
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# some new improvments for LINGUAS handling
-	einfo "\n \t VDR supports now the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-}
-
-pkg_postinst() {
-	elog "!!!! WARNING !!!!"
-	elog "  ${P} contains large changes with respect to"
-	elog "  how it handles video streams, so expect this"
-	elog "  version to not work as good as the versions before!"
-	elog
-	elog "  We strongly advise you NOT to use this version"
-	elog "  on a productive system!"
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.32-r1.ebuild b/media-video/vdr/vdr-1.7.32-r1.ebuild
deleted file mode 100644
index 9b5c4ba..0000000
--- a/media-video/vdr/vdr-1.7.32-r1.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg naludump pinplugin
-	rotor setup ttxtsubs volctrl wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v3"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/${PN}-1.7.27_linguas-v2.diff"
-	epatch "${FILESDIR}/${P}_parallel-install.patch"
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# some new improvments for LINGUAS handling
-	einfo "\n \t VDR supports now the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-}
-
-pkg_postinst() {
-	elog "!!!! WARNING !!!!"
-	elog "  ${P} contains large changes with respect to"
-	elog "  how it handles video streams, so expect this"
-	elog "  version to not work as good as the versions before!"
-	elog
-	elog "  We strongly advise you NOT to use this version"
-	elog "  on a productive system!"
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.33-r1.ebuild b/media-video/vdr/vdr-1.7.33-r1.ebuild
deleted file mode 100644
index 0f66370..0000000
--- a/media-video/vdr/vdr-1.7.33-r1.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	lircsettings mainmenuhooks menuorg naludump pinplugin
-	rotor setup ttxtsubs vasarajanauloja volctrl wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v18"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/${PN}-1.7.27_linguas-v2.diff"
-	epatch "${FILESDIR}/${P}_parallelmake.patch"
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# some new improvments for LINGUAS handling
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.33.ebuild b/media-video/vdr/vdr-1.7.33.ebuild
deleted file mode 100644
index 37fca69..0000000
--- a/media-video/vdr/vdr-1.7.33.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	liemikuutio lircsettings mainmenuhooks menuorg naludump pinplugin
-	rotor setup ttxtsubs volctrl wareagleicon yaepg"
-# pinplugin, broken yet
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v14"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.10
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/ifdef DVBDIR/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
-	epatch "${FILESDIR}/${PN}-1.7.27_linguas-v2.diff"
-	epatch "${FILESDIR}/${P}_parallelmake.patch"
-
-	# Do not install runvdr script and plugins
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use liemikuutio && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# some new improvments for LINGUAS handling
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	exeinto /usr/share/vdr/bin
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
-		einfo "Installing sources"
-		insinto "${SOURCES_DEST}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${SOURCES_DEST}"/PLUGINS/lib
-	fi
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.36-r1.ebuild b/media-video/vdr/vdr-1.7.36-r1.ebuild
deleted file mode 100644
index b86bd49..0000000
--- a/media-video/vdr/vdr-1.7.36-r1.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	lircsettings mainmenuhooks menuorg naludump
-	rotor setup ttxtsubs vasarajanauloja volctrl wareagleicon yaepg"
-# pinplugin, temp disabled, need fixing
-# mcli, obsoleted, will be removed in future extpng version
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-		# do we need this?
-#		PLGCFG			= \${PREFIX}/include/vdr/Make.config
-		# undefined gives it an empty string back in vdr.pc
-		# so, if it is PLGCFG -include(d) in plugin makefiles, it will not used,
-		# we dont need patching plugins with vdr-plugin-2.eclass !
-		# if we realy need the Make.conf in some cases, add in plugin ebuild
-		# EXPORT plgcfg=/usr/include/vdr/Make.conf
-		# test needed!
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.36.ebuild b/media-video/vdr/vdr-1.7.36.ebuild
deleted file mode 100644
index 58efa61..0000000
--- a/media-video/vdr/vdr-1.7.36.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	lircsettings mainmenuhooks menuorg naludump
-	rotor setup ttxtsubs vasarajanauloja volctrl wareagleicon yaepg"
-# pinplugin, temp disabled, need fixing
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.0.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		## PLUGINLIBDIR (old plugin Makefile) = LIBDIR ( new plugin Makefile )
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-		# we need this for backwards compatibility, on old plugin makefiles
-		PLGCFG			= \${PREFIX}/include/vdr/Make.config
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		# was default enabled in old versions of extpatch
-		enable_patch MCLI
-
-		# needed for usefhs support
-		sed -e "s:resdir=\$(RESDIRDEF):resdir=/usr/share/vdr:" \
-			-i Makefile
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing mcli channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins vdr.pc
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of support"
-		elog "of VDR on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.38.ebuild b/media-video/vdr/vdr-1.7.38.ebuild
deleted file mode 100644
index 9939df2..0000000
--- a/media-video/vdr/vdr-1.7.38.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	mainmenuhooks menuorg naludump permashift pinplugin
-	rotor setup ttxtsubs vasarajanauloja volctrl wareagleicon yaepg"
-# plugin vdr-permashift, need testing
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v5"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; param only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-		# do we need this?
-#		PLGCFG			= \${PREFIX}/include/vdr/Make.config
-		# undefined gives it an empty string back in vdr.pc
-		# so, if it is PLGCFG -include(d) in plugin makefiles, it will not used,
-		# we dont need patching plugins with vdr-plugin-2.eclass !
-		# if we realy need the Make.conf in some cases, add in plugin ebuild
-		# EXPORT plgcfg=/usr/include/vdr/Make.conf
-		# test needed!
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# patches, they will be removed from extpatchng in next versions
-		use vasarajanauloja && eerror "\npatch vasarajanauloja marked for removal, use the plugin vdr-extrecmenu\n"
-		use volctrl && eerror "\npatch volctrl marked for removal, fix your RemoteControl setup!\n"
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# support plugin vdr-permashift ( NEED PLUGIN TESTING )
-		epatch "${FILESDIR}/extpng-${P}-gentoo-edition-v3_001-addon-permashift.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.39.ebuild b/media-video/vdr/vdr-1.7.39.ebuild
deleted file mode 100644
index 6d14cd1..0000000
--- a/media-video/vdr/vdr-1.7.39.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft jumpplay
-	mainmenuhooks menuorg naludump permashift pinplugin
-	rotor setup ttxtsubs vasarajanauloja volctrl wareagleicon yaepg"
-# plugin vdr-permashift, need testing
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="jumpingseconds"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v4"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; param only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-		# do we need this?
-#		PLGCFG			= \${PREFIX}/include/vdr/Make.config
-		# undefined gives it an empty string back in vdr.pc
-		# so, if it is PLGCFG -include(d) in plugin makefiles, it will not used,
-		# we dont need patching plugins with vdr-plugin-2.eclass !
-		# if we realy need the Make.conf in some cases, add in plugin ebuild
-		# EXPORT plgcfg=/usr/include/vdr/Make.conf
-		# test needed!
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${P}-fixutf8.diff"
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# patches, they will be removed from extpatchng in next versions
-		use vasarajanauloja && eerror "\npatch vasarajanauloja marked for removal, use the plugin vdr-extrecmenu\n"
-		use volctrl && eerror "\npatch volctrl marked for removal, fix your RemoteControl setup!\n"
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# support plugin vdr-permashift ( NEED PLUGIN TESTING )
-		epatch "${FILESDIR}/extpng-vdr-1.7.38-gentoo-edition-v3_001-addon-permashift.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.40.ebuild b/media-video/vdr/vdr-1.7.40.ebuild
deleted file mode 100644
index 58cc83b..0000000
--- a/media-video/vdr/vdr-1.7.40.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds
-	mainmenuhooks menuorg naludump permashift pinplugin
-	rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-# plugin vdr-permashift, need testing
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="volcrtl"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${PN}-1.7.39-gentoo-edition-v4"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; param only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-#	epatch "${FILESDIR}/${P}-fixutf8.diff"
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# patches, they will be removed from extpatchng in next versions
-		use vasarajanauloja && eerror "\npatch vasarajanauloja marked for removal, use the plugin vdr-extrecmenu\n"
-#		use volctrl && eerror "\npatch volctrl marked for removal, fix your RemoteControl setup!\n"
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# support plugin vdr-permashift ( NEED PLUGIN TESTING )
-		epatch "${FILESDIR}/extpng-${P}-gentoo-edition-v1_001-plugin-permashift.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-#		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.41-r1.ebuild b/media-video/vdr/vdr-1.7.41-r1.ebuild
deleted file mode 100644
index 49adca1..0000000
--- a/media-video/vdr/vdr-1.7.41-r1.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds
-	mainmenuhooks menuorg naludump permashift pinplugin
-	rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-# droped use-flag: volctrl
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="volctrl"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${PN}-1.7.39-gentoo-edition-v4"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; param only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-#	epatch "${FILESDIR}/${P}-fixutf8.diff"
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# support plugin vdr-permashift ( NEED PLUGIN TESTING )
-		epatch "${FILESDIR}/extpng-${P}-gentoo-edition-v1_001-plugin-permashift.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	diropts -m0755 -ovdr -gvdr
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-
-	# correct wrong permission from earlyer install
-	CACHEOWNER="$(stat -c %U /var/cache/vdr)"
-	if [ ! ${CACHEOWNER} == vdr ]; then
-		chown -R vdr:vdr "${ROOT}/var/cache/vdr"
-	fi
-
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.41.ebuild b/media-video/vdr/vdr-1.7.41.ebuild
deleted file mode 100644
index 5e5ce73..0000000
--- a/media-video/vdr/vdr-1.7.41.ebuild
+++ /dev/null
@@ -1,408 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds
-	mainmenuhooks menuorg naludump permashift pinplugin
-	rotor setup ttxtsubs wareagleicon yaepg"
-# droped use-flag: volctrl vasarajanauloja
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="volctrl vasarajanauloja"
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${PN}-1.7.39-gentoo-edition-v4"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc1
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; param only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-#	epatch "${FILESDIR}/${P}-fixutf8.diff"
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# patches, they will be removed from extpatchng in next versions
-#		use vasarajanauloja && eerror "\npatch vasarajanauloja marked for removal, use the plugin vdr-extrecmenu\n"
-#		use volctrl && eerror "\npatch volctrl marked for removal, fix your RemoteControl setup!\n"
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# support plugin vdr-permashift ( NEED PLUGIN TESTING )
-		epatch "${FILESDIR}/extpng-${P}-gentoo-edition-v1_001-plugin-permashift.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		# patches that got renamed
-#		use vasarajanauloja && enable_patch jumpingseconds
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-	elog "This is a *developer* version."
-	elog "We strongly recommend that you only use it under controlled"
-	elog "conditions and for testing and debugging."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-1.7.42.ebuild b/media-video/vdr/vdr-1.7.42.ebuild
deleted file mode 100644
index 426d201..0000000
--- a/media-video/vdr/vdr-1.7.42.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds
-	mainmenuhooks menuorg naludump permashift pinplugin
-	rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0_rc2
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or to old for ${P}"
-		eerror "You cannot compile VDR against old dvb-headers"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; param only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	# Do not compile/install plugins from vdr source
-	sed -i Makefile \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# these patches we do not support
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t you will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "emake install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	diropts -m0755 -ovdr -gvdr
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-
-	# correct wrong permission from earlyer install
-	CACHEOWNER="$(stat -c %U /var/cache/vdr)"
-	if [ ! ${CACHEOWNER} == vdr ]; then
-		chown -R vdr:vdr "${ROOT}/var/cache/vdr"
-	fi
-
-	elog "This is a *developer* version."
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed"
-		elog "This results now in a lot of not working plugins on compile process"
-		elog "Please visit for more infos:"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "By default VDR is now built according to the FHS"
-		elog "Gentoo VDR still use the standard from"
-		elog "Filesystem Hirarchy Standard"
-		elog "It is supported thins beginning of VDR support"
-		elog "on Gentoo"
-		elog "Finaly, for the user are minimal changes now"
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	local keysfound=0
-	local key
-	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file="${ROOT}"/etc/vdr/remote.conf
-
-	if [[ -e ${remote_file} ]]; then
-		for key in ${warn_keys}; do
-			if grep -q -i "\.${key} " "${remote_file}"; then
-				keysfound=1
-				break
-			fi
-		done
-		if [[ ${keysfound} == 1 ]]; then
-			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
-			ewarn "Please remove these keys or vdr will not start:"
-			ewarn "#  ${warn_keys}"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}
diff --git a/media-video/vdr/vdr-2.0.0.ebuild b/media-video/vdr/vdr-2.0.0.ebuild
deleted file mode 100644
index fe19210..0000000
--- a/media-video/vdr/vdr-2.0.0.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.0.ebuild,v 1.1 2013/03/31 10:31:41 hd_brummy Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift
-	pinplugin rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0
-	media-fonts/corefonts"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolete!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	# apply maintainace-patches
-
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}/${P}_gentoo.patch"
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# we do not support these patches
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS is up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	fi
-
-	epatch_user
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "einstall failed"
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	diropts -m0755 -ovdr -gvdr
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-
-	# correct wrong permission from earlier install
-	CACHEOWNER="$(stat -c %U /var/cache/vdr)"
-	if [ ! ${CACHEOWNER} == vdr ]; then
-		chown -R vdr:vdr "${ROOT}/var/cache/vdr"
-	fi
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, one of this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "  In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed."
-		elog "  This results now in a lot of plugins which do on compile any more."
-		elog "  Please visit for more infos:"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "  and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "  By default VDR is now build according to the FHS."
-		elog "  Gentoo VDR still uses the standard from"
-		elog "  Filesystem Hierarchy Standard"
-		elog "  It is supported since beginning of VDR support"
-		elog "  on Gentoo"
-		elog "  Finally, there are minimal changes for the user."
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
-}