cleanup old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x34C2808A

15 files changed, 17 insertions, 1419 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index aa1adcf46261..44ca2a361324 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.179 2014/01/20 18:40:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.180 2014/06/15 08:15:37 hd_brummy Exp $
+
+  15 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.6.0_p2-r7.ebuild,
+  -vdr-1.6.0_p2-r11.ebuild, -files/vdr-1.6.0-extensions-72-gcc-4.4.diff,
+  -files/vdr-1.6.0-gcc-4.4.diff, -files/vdr-1.6.0-ldflags.patch,
+  -files/vdr-1.6.0-makefile-install-header.diff,
+  -files/vdr-1.6.0-shared-tinyxml.diff, -files/vdr-1.6.0-use-v4l2.patch,
+  -files/vdr-1.6.0_p2_fontconfig_fontsort.patch,
+  -files/vdr-1.6.0_p2_gcc-4.7.patch, -files/vdr-1.6.0_p2_linguas-v3.diff,
+  -files/vdr-dvb-api-5-is-fine.diff, metadata.xml:
+  cleanup old
 
 *vdr-2.0.5 (20 Jan 2014)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index bc3dc396ad2a..b70f2acc9b7c 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,36 +2,20 @@
 Hash: SHA256
 
 AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
-AUX vdr-1.6.0-extensions-72-gcc-4.4.diff 1387 SHA256 bf225b66249e17635412a3211d024b341e53ef8c3715b8ca1a7aa63d32cc4a45 SHA512 e9d0b6520d21232a2ccff4e7e8a586362090456d573a8b8cc751b8bd3eeb6b1406bd9d80aea8690882f9baa819a5868aab48336c42f942fe4b1519bf83383430 WHIRLPOOL 53151e9234745709e4cd82e34d1af5f82f789e31eedd518beb402dedb54e68b89a3cafe7b6b1c906cfdc684a3842e3fa12f09f275a68f52ae23fca4185b40cf1
-AUX vdr-1.6.0-gcc-4.4.diff 4508 SHA256 7dcf712337877ca4b162ee50416b844f54de286cd2be22844539e83336b567fe SHA512 6b0cc87f9901f25027422e6e9486ad8264308cb5353264e65fac1f4988f0d7f8bf265fa88a82e187ff014f650154d25580e2337bed787149b0ed9d2bcb8740a2 WHIRLPOOL d6afab51c6cba060877328b5b68a19979fd5e4eab3a55a9f94130f15872934b2bff0bf1fe8b11bf3a3feeded6c003e666b846574199a4d3a41b69303170f43b2
-AUX vdr-1.6.0-ldflags.patch 380 SHA256 fb8fac241a56293debe8cd6393867aac8a4750a98606c71178ce8c7e1b03f1ce SHA512 75b9553d282739264a2f905bbe8d299fd851ea5a122e9fff4efaf442a4d9845be6e894a71d16a4ea95a12519ddc1a8f5338cb8fb3072e0721c3ccd45ab6f8ddf WHIRLPOOL b593a2f4f4ce2ffc053adffbf32655423ff0552fd0e9dabc792fa36db9158c23958d7438ff22fa3c963858aae46a1ca683690f1ac9ed56e172d5f5832f41f1a3
-AUX vdr-1.6.0-makefile-install-header.diff 1064 SHA256 e3d9d76d0ede46b93473abe72d05771b02b1e19c380d98c48375e94a5ecab0df SHA512 11e2966174f9672e89972922ed9bcea2146c59344ffd7ab9da37b2c488f6a113cf85f2c815a9aae9855f0ce067a8100fc5fe95292b32a57d147fae4898aa7fec WHIRLPOOL 2e0b5aa10eda430b15691c32ce8535b129177f30760db94fb883dcb600e6110dfa19ed9345653a4fa65391e3b6f3a1ba7d657cd1a48af9f6bdaa552d31f5a8ff
-AUX vdr-1.6.0-shared-tinyxml.diff 1215 SHA256 3f23bb66125a1fc415c4d7312996d7382c89637eb9ebe3f0bc2b0cfc54de860f SHA512 8a9fe90aad66f5ff247c7365f04095bfdef12da8c0f8f62ff40ab98a259dff079efdc5915e144e5638d39e7fe1ed94a7f7e621bf8b5336596ab9e99078d53da8 WHIRLPOOL 3846bc1ed3678018b6cbab4b2503192c84de06ffa3d52f84563146a6aa03703542c8d251d0216109d75c5cbb1e38fee304f6178fe024d7b83a8f329c5b743898
-AUX vdr-1.6.0-use-v4l2.patch 7994 SHA256 c4f5ec527c1ac8fa82a2a780251e040471a7056f1a784d817a9e8fc56280a852 SHA512 ce690b719a44fba67a82918335a6773dd912d00e6ab40de2b9ec7d9c72ee11e1a5a51840898ced4343097dd30190ff277eda699fd8285e766de60694506e30fd WHIRLPOOL bb3a12be1ac9e07bdae190e58e28dc1e00710dc7234ca88bb00799ee668c7ebc7869fcb85f586373ccab7c8dc9ce2a9e4659b1e0c682e9c1dbdbc1bdc90537cd
-AUX vdr-1.6.0_p2_fontconfig_fontsort.patch 566 SHA256 fdf75ca1f2f041eacb19974b27dfb21eece202ddde0a54a5041a85d1fa3a3f47 SHA512 d80b673de0a8b3006d7fe9119f890e2b280afaf5df06913a4c630d51e22441360dbe1b3d5e9aace737aa2d3a822bf3900d4b309b4b4a716908fd3f0dd527c5b1 WHIRLPOOL b47b8e7e9365a28ded979a7367d83902eaecab4e49cf4396799334b983f1b03708be9730f79d427a426b070973891c24e9568423e991d95e8b62521a4c064655
-AUX vdr-1.6.0_p2_gcc-4.7.patch 603 SHA256 d7fe0d360d96dcd2636cfc7e6a3d1aff9e97522ace1f068e2b75685284ed111c SHA512 4d99dcd0bb7f51980b63d440ea4a0a4601823b566af45bd97a3fcc2f0f5325225ef516a01dae5394d0fe40ba70f9f23416cfb8795033c0683b60f2e14f942bac WHIRLPOOL fde95f3b313a1a18671cec3afa688c363e46ffca5656d1afdf145890d2bb2b4c90b07cb1bdc653c49fc11295aa785a800c98018da45c19a0d110f55f8b664d30
-AUX vdr-1.6.0_p2_linguas-v3.diff 937 SHA256 d07252828f226bd8e63c7958629c4fe69102c32ffd884461dd803625b936a4fe SHA512 02dda3acc348f70ad9df6da52d27bf328d34b0d9a8da522590d688bbdbd0e9cbb565a2ec9ace7130ae6a7bf2daa89e64e23c3a2a3825f1cfbb1571721190c2bb WHIRLPOOL d0a57857979c41d5a27a09921c70a0f9c32cee703bb38d3e1286ed41c794873099691f97539c107f5d59b1c0f65d800c3fcdd79a879edf2aad9f7d7dfe774b90
 AUX vdr-2.0.0-fixkeeptracksinit.diff 518 SHA256 5d93c9fbf4fe6cfe0087f78e4cdf945a5307d5e03045cc34705be14a9b3db63e SHA512 31097b29c11bc2fc3246de44030a050bdeb195d40680b29a6aeaf072362687709d65e02c9676d08d1817b57ac5fde84fbf59261514a7ccb7d8c62eb27ff92310 WHIRLPOOL fca0e756ec4ef2b99c064385fda2b96165559d47901955bd3f7ba6b09e7e529dfbd25ec6a04d96807401c12f914f067c7ce3905f864ed3c5e03cd4c4040a7796
 AUX vdr-2.0.0_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
-AUX vdr-dvb-api-5-is-fine.diff 392 SHA256 ba126c8233bae50f514aa713072027968d9e115e0d154e2e1d31fe1b8cbbb403 SHA512 2905ac6c3257fb09cc42adeaa4c42e8ef944cb267d878b92015f61a1d33a90b75d11a261ae680e1148e07b410e2a385e141988ac6bab87962a10374c4bd3756a WHIRLPOOL a9a53cff9957bc4ff4f0aed38bd7d07cf3036733cfc5a96ad4b1091cca8d7da35044865b4c370ec50a485c17f7a82dd27d7d2b858e3861a225284cd415a2544f
-DIST VDR-Extensions-Patch-72.tar.bz2 445171 SHA256 defad883a4f42ebc257c14e1a71ec559db2d4d1d2d37eeee04abca542efbcf8d SHA512 6494adace96828cf78bd1c674057c56721a854ddc169a27d52690a717d946ac1fd8be5e5a1c4f66081fd97d2732d62a3e10f7c073b0bef4203a1484da8650c06 WHIRLPOOL b8a069e079b0876fc801d9fcf5d442186cb78fb02a9f9f422e34481b45d0de65783776e65e04feabe1e5ae871715c06ccf32efb106890caf33b922d07cbbb3a0
 DIST extpng-vdr-2.0.4-gentoo-edition-v1.patch.bz2 66092 SHA256 4da8573ee8ad6d5524563e805591407774c4cc7aa10d92ccbff3efa90473b795 SHA512 42c4f488f7cc28491e0652a923fd2e49cad9e749261c0907f1911d5e377009e9ff0adbb1f9385a6a00151ec6934d1e6fd38fc8356d2811abc827df775171469c WHIRLPOOL 012f63ce69a949aedba091f88cc8bce04352d45ba962c55522849003c020072295405cef9813af41bb15af0d30b006eb1b9b1fb149b3b948e89b40d4f32b710e
-DIST vdr-1.6.0-1.diff 6750 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416a3c80f76b6a5b209eb SHA512 e64abf7b2d03fa6ea216d1d0d8ee2d88a9e2d8dae4cc40403b35503a5342196ede1bdcf591682b3316654834879b37e875aa53443e18d6a758b65dddc051b8dd WHIRLPOOL 303950fe5664fba93a639e91b84574087e58c12adae8d681f19b343ae85efe07eb10c01fc00c65b07d8d17e28cbcc57852d265a39aa8fe01ad135fa2f7912897
-DIST vdr-1.6.0-2.diff 17906 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef SHA512 b41ff619ecb173b8e17ede2f153c76464529bdcb3d53dff0b7edc4786486d7df57cd51becbe1693b0e5f669e96c08829b8ddccac7a33151d1218604087fbb1fd WHIRLPOOL 2d5475ee44cb44e3b4b39ae4439d1457b986632420769ad9f4c7de474d38234e8dda6534ef8bcace537b491cf14105d26fcaddc8f087729797cfcba85ba0abe2
-DIST vdr-1.6.0.tar.bz2 593172 SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6 SHA512 1b3d4280038399f622e6aaa1a2edcc288caaa19a886c0b26bdb5764a93700be5647d4231cc13797594d52769010e61158ceedbff5d9520a66c74cabdba1e4154 WHIRLPOOL 2725662dacacddcde5800fa79b057f03b3bf7538cdd189eeda04a78b4a17a130de4c322c0efb007684205f9305b93c68882a87c409884de907609a0826182b8f
 DIST vdr-2.0.4.tar.bz2 836834 SHA256 4c1ab2e7fa01c95ff83feec7601ad7241a256f05f7d15ef1d79b5b84b84f9ea3 SHA512 b64bbb61eb049b5f34c351b1ca0d77a93830dd8ca6fdec81becbc3be01f833512852c59e7e5290708d9f7b9bfb46d573d269300ffd025cc791263ff7323a632b WHIRLPOOL 113542272970fa1413b8ec296445eb198e319bba5dfa0c24a0e193afffff3cdcca563ae98c2b2bc4d49d779f401ba93c1e3aa0268f2a10d2b495e3e5d4be9c00
 DIST vdr-2.0.5.tar.bz2 837135 SHA256 04490e31241c3ba1e26cdc1bf7ab119fa08b2a0ebe07a9082b4a48e30a3b25ea SHA512 4a6d6f86648891c474a1af948ecc14c8f2c7b7e44356f4237fc96f962a3a778fdba4b30c26966e97dbaa17c1c809898de4e50583c8c950dd9cb27409a4b401df WHIRLPOOL b79a26c522feb062021080b8888158e8ca0ccc43759841a8b59e6ca94c7b6004e3445edab2e34c760338518510e169ea1214371ceb8736470defab0662d2cb7c
-EBUILD vdr-1.6.0_p2-r11.ebuild 11650 SHA256 368aae809fecd97b76f201943a8f53acf0949d170cbf937187d120f5b88cbef3 SHA512 28cfb43e2689105461f0767d2a7f6cda6b09adfc4c4122ea05f3464ef3bc64a9fe2046ae63b096e85ed2531689a74fab26a061731cbca3f816e9ccea8ad2784e WHIRLPOOL e6c95202c585a02fb66af92bcb04ff0f26a03f849dc40a021cde5d7122afc7cceb02a12150afda6ab4891352907abf08e7afa5416cfe9c9df1e6d72312167193
-EBUILD vdr-1.6.0_p2-r7.ebuild 11509 SHA256 8d84d6f4b5ed519db0cc1882f67b9e8e5611ec2e403dc4ce6b70f329119ae0c8 SHA512 9f6f6ab7116fba92527ad1a890b8e4b7bcc1421b49806c925f3f816e7cdb5e4a5c89ee2033168d239dec6bc25b8db42900feef5bb779648b24131bd8544a151c WHIRLPOOL 8f693c8e834a7837dd3cbdcbd072ab4d5f014a8d8d03f7bf449c84d5d8830f3119913f86c59820de10ab0eaaaec689dc51c4308d0f466e60d2300c30117b0a8b
 EBUILD vdr-2.0.4.ebuild 10155 SHA256 0f42b7af9fb0f1c7f0a4fe1d368108e0590f714d552d0af2aa17c0387a7e66e0 SHA512 056078c372f8070d90d2133f159a8663ea05bedcd0db4d024d483c98979cec5e784fbece6fa78ac19c3e56021812fbdd8c91c6e0ed1fe92df738f8595f955554 WHIRLPOOL fc6132e5fdec6e572a7a5bece5d9505ca06d38fe569fa4814e3e9d5dca53323b3d21f0246baaa8348d554135721ea7c0805070d33230138f305605a9231d9fda
 EBUILD vdr-2.0.5.ebuild 10427 SHA256 7d5a2e57aad2313fb98b05969a6db2d9dc3ec50f0a1b2ce1c24a3ae670eff962 SHA512 d0c15555dee7aef96bc67a2690dd8cbc9efc0770388551c027bc97d9426874beb711c088d9f9185545bf91d3ae39825ce6ada32f0d4b6bcfdb9b34a1a5ce9ba6 WHIRLPOOL 42df21f8f8c1466b6e404ac3423e8223c25df848d5c9b7e8b9e772bc9720dbd28d76ab7da07f352206ca020de6a5903bf3aae9edbfdd4adca7b0e251fcf4edea
-MISC ChangeLog 32562 SHA256 4f6ed3b753b548bde5f358ca8ae615d5a418fb7870d0dcc3635edb2ade727766 SHA512 861b2b84807bfeb0e410d1155ac2757382614503c15cbbc2272a4c51173a53f0ad328396960914e429b6c130e2a47487a0553d63ca60b18264e4339bd15b2752 WHIRLPOOL 0de4b8777b59376ac5007772be045ab6cbebf8d5e113aae3444f573172c18078b15d23620506327f2b2a1e3e88a625d46a57fb8fbbbb47782f07ed9ba245bd01
-MISC metadata.xml 4842 SHA256 61084e6d2fcf848f378cfa5dfd74ff71ce7fb4f60d5da533b55d00f0d931ed3b SHA512 eb1df58cf1ee44d32e94ea4ecaa2d4f2f4931208ac5ef4f4c982c8712cdaa626905e24e2e5fa55a833ef67da5060e73bc0741ac3e943d3100ce97f669aa2b474 WHIRLPOOL 98f532466971cf6ffbdf56446cc45986227abc5b01b85be42c278e3b350afcf01a3e7a6a21fdf781425d822a424b1131e697392101d249aaad4aa59b92ba0393
+MISC ChangeLog 33091 SHA256 19634ad12141e1c46708866065906f102fa90caeda7c03837e8b11389f6669ff SHA512 7db5b8f6dc309600f574f868f639c95c8cedb20109d1895a133d21bb1d0a61afb330f115c72e43aedb0f5033a4761a9bad707f136f3b637c0dcabdd26af9e0ee WHIRLPOOL 49b9ab0e8796e73b1685d2be2d2e96524a2bc4294fc2c73d3ab0b0ab7d7317e6e9cdfeadb3e704322e189118fc6ae0688ed353470f5528cdb141775bda67ea53
+MISC metadata.xml 1819 SHA256 e83b25bd6565b63107a5ec54373a62ced253f0044216bf6471fde39ae988a394 SHA512 4fe07002a7511188f1e9262e067924c4d6db8442cfead9d861ae1f6c686ebfc65654b03fce642ba92ec8bfe6e0ce1f4e0f6d2f3d208d84393eedf3c02d015832 WHIRLPOOL 18650757f8df3bbf4abc0583f12067a090d27178b708c02aeda4c5ae1d9791a3fe5e52c8d39011467cc052566eb250a8775cb53bfacce1bbf7afcc3faf13ecae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFS3W2mdn07HTTCgIoRCASGAKCUY0vGcPSiNF42YV5PdepcfmYSsQCdEnim
-gdzO5uYvalFmUf1Wx6fNlPk=
-=PTvY
+iD8DBQFTnVYudn07HTTCgIoRCKksAJ9zoFzFDMK9pDOdDDfUEb4zPRXQ7ACfWPXq
+8eM68jhIqVbmyOSrYRvd31Q=
+=oSrv
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
deleted file mode 100644
index a36d2b7f8774..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru vdr-1.6.0-orig/menu.c vdr-1.6.0/menu.c
---- vdr-1.6.0-orig/menu.c	2009-06-04 10:55:14.481017158 +0200
-+++ vdr-1.6.0/menu.c	2009-06-04 10:57:12.690998810 +0200
-@@ -777,14 +777,14 @@
-         }
- #endif /* PINPLUGIN */
- #ifdef USE_LIEMIEXT
--     char* p = strrchr(data.file, '~');
-+     const char* p = strrchr(data.file, '~');
-      if (p) {
-         p++;
-         Utf8Strn0Cpy(name, p, sizeof(name));
-         Utf8Strn0Cpy(path, data.file, sizeof(path));
--        p = strrchr(path, '~');
--        if (p)
--           p[0] = 0;
-+        char *p2 = strrchr(path, '~');
-+        if (p2)
-+           p2[0] = 0;
-         }
-      else {
-         Utf8Strn0Cpy(name, data.file, sizeof(name));
-diff -ru vdr-1.6.0-orig/videodir.c vdr-1.6.0/videodir.c
---- vdr-1.6.0-orig/videodir.c	2009-06-04 10:55:14.477693736 +0200
-+++ vdr-1.6.0/videodir.c	2009-06-04 10:55:24.531019647 +0200
-@@ -199,9 +199,10 @@
- #ifdef USE_HARDLINKCUTTER
- static bool StatNearestDir(const char *FileName, struct stat *Stat)
- {
--  cString Name(FileName);
-+  char *Name = strdup(FileName);
-+  cString Name_str(Name, true); /* manage free for us */
-   char *p;
--  while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
-+  while ((p = strrchr(Name + 1, '/')) != NULL) {
-         *p = 0; // truncate at last '/'
-         if (stat(Name, Stat) == 0) {
-            isyslog("StatNearestDir: Stating %s", (const char*)Name);
diff --git a/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
deleted file mode 100644
index e57458deb180..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/recording.c b/recording.c
---- a/recording.c
-+++ b/recording.c
-@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
-      Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
-      Subtitle = SubtitleBuffer;
-      }
--  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
--  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
-+  const char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
-+  const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
-   if (macroTITLE || macroEPISODE) {
-      name = strdup(Timer->File());
-      name = strreplace(name, TIMERMACRO_TITLE, Title);
-@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileName)
-   sortBuffer = NULL;
-   fileName = strdup(FileName);
-   FileName += strlen(VideoDirectory) + 1;
--  char *p = strrchr(FileName, '/');
-+  const char *p = strrchr(FileName, '/');
- 
-   name = NULL;
-   info = new cRecordingInfo;
-@@ -1022,7 +1022,7 @@ void cRecordings::DelByName(const char *FileName)
-   if (recording) {
-      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
-      Del(recording, false);
--     char *ext = strrchr(recording->FileName(), '.');
-+     char *ext = strrchr(recording->fileName, '.');
-      if (ext) {
-         strncpy(ext, DELEXT, strlen(ext));
-         recording->fileSizeMB = DirSizeMB(recording->FileName());
-diff --git a/svdrp.c b/svdrp.c
---- a/svdrp.c
-+++ b/svdrp.c
-@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
-      char *strtok_next;
-      FileName = strtok_r(p, delim, &strtok_next);
-      // image type:
--     char *Extension = strrchr(FileName, '.');
-+     const char *Extension = strrchr(FileName, '.');
-      if (Extension) {
-         if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
-            Jpeg = true;
-@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
-      char RealFileName[PATH_MAX];
-      if (FileName) {
-         if (grabImageDir) {
--           cString s;
--           char *slash = strrchr(FileName, '/');
-+           cString s(FileName);
-+           FileName = s;
-+           const char *slash = strrchr(FileName, '/');
-            if (!slash) {
-               s = AddDirectory(grabImageDir, FileName);
-               FileName = s;
-               }
-            slash = strrchr(FileName, '/'); // there definitely is one
--           *slash = 0;
--           char *r = realpath(FileName, RealFileName);
--           *slash = '/';
-+           cString t(s);
-+           t.Truncate(slash - FileName);
-+           char *r = realpath(t, RealFileName);
-            if (!r) {
-               LOG_ERROR_STR(FileName);
-               Reply(501, "Invalid file name \"%s\"", FileName);
-diff --git a/channels.c b/channels.c
---- a/channels.c
-+++ b/channels.c
-@@ -574,7 +574,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
-      }
-   else
-      q += sprintf(q, " none");
--  dsyslog(buffer);
-+  dsyslog("%s", buffer);
- }
- 
- void cChannel::SetRefChannel(cChannel *RefChannel)
-diff --git a/device.c b/device.c
---- a/device.c
-+++ b/device.c
-@@ -529,7 +529,7 @@ eVideoSystem cDevice::GetVideoSystem(void)
-   return vsPAL;
- }
- 
--//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
-+//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog("%s", b); }
- #define PRINTPIDS(s)
- 
- bool cDevice::HasPid(int Pid) const
-diff --git a/pat.c b/pat.c
---- a/pat.c
-+++ b/pat.c
-@@ -144,7 +144,7 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
-   q += sprintf(q, "CAM: %04X %5d %5d %04X %d -", source, transponder, serviceId, d->getCaType(), Stream);
-   for (int i = 0; i < nca->Length(); i++)
-       q += sprintf(q, " %02X", nca->Data()[i]);
--  dsyslog(buffer);
-+  dsyslog("%s", buffer);
- #endif
- }
- 
-diff --git a/receiver.c b/receiver.c
---- a/receiver.c
-+++ b/receiver.c
-@@ -40,7 +40,7 @@ cReceiver::~cReceiver()
- {
-   if (device) {
-      const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
--     esyslog(msg);
-+     esyslog("%s", msg);
-      fprintf(stderr, "%s\n", msg);
-      *(char *)0 = 0; // cause a segfault
-      }
diff --git a/media-video/vdr/files/vdr-1.6.0-ldflags.patch b/media-video/vdr/files/vdr-1.6.0-ldflags.patch
deleted file mode 100644
index 313dc06b981d..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2010-08-19 19:55:32.592363028 +0100
-+++ Makefile	2010-08-19 19:55:45.162140354 +0100
-@@ -94,7 +94,7 @@
- # The main program:
- 
- vdr: $(OBJS) $(SILIB)
--	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
-+	$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
- 
- # The libsi library:
- 
diff --git a/media-video/vdr/files/vdr-1.6.0-makefile-install-header.diff b/media-video/vdr/files/vdr-1.6.0-makefile-install-header.diff
deleted file mode 100644
index bb53811385a9..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-makefile-install-header.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: vdr-1.5.13/Makefile
-===================================================================
---- vdr-1.5.13.orig/Makefile
-+++ vdr-1.5.13/Makefile
-@@ -20,6 +20,7 @@ PREFIX  ?= /usr/local
- MANDIR   = $(PREFIX)/share/man
- BINDIR   = $(PREFIX)/bin
- LOCDIR   = ./locale
-+INCDIR   = $(PREFIX)/include
- LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
- INCLUDES = -I/usr/include/freetype2
- 
-@@ -161,7 +162,7 @@ clean-plugins:
- 
- # Install the files:
- 
--install: install-bin install-conf install-doc install-plugins install-i18n
-+install: install-bin install-conf install-doc install-plugins install-i18n install-header
- 
- # VDR binary:
- 
-@@ -192,6 +193,13 @@ install-plugins: plugins
- 	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
- 	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
- 
-+# Header files:
-+
-+install-header:
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp *.h Make.config $(DESTDIR)$(INCDIR)/vdr
-+	@cp libsi/*.h $(DESTDIR)$(INCDIR)/vdr/libsi
-+
- # Source documentation:
- 
- srcdoc:
diff --git a/media-video/vdr/files/vdr-1.6.0-shared-tinyxml.diff b/media-video/vdr/files/vdr-1.6.0-shared-tinyxml.diff
deleted file mode 100644
index 2f33b2693275..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-shared-tinyxml.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur vdr-1.6.0.orig/Makefile vdr-1.6.0/Makefile
---- vdr-1.6.0.orig/Makefile	2010-12-29 14:58:18.000000000 +0100
-+++ vdr-1.6.0/Makefile	2010-12-29 14:59:26.000000000 +0100
-@@ -53,7 +53,8 @@
- endif
- 
- ifdef SETUP
--OBJS += tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o submenu.o
-+OBJS += submenu.o
-+LIBS += -ltinyxml
- endif
- 
- ifdef TTXTSUBS
-diff -Naur vdr-1.6.0.orig/submenu.c vdr-1.6.0/submenu.c
---- vdr-1.6.0.orig/submenu.c	2010-12-29 14:58:18.000000000 +0100
-+++ vdr-1.6.0/submenu.c	2010-12-29 15:00:29.000000000 +0100
-@@ -39,7 +39,7 @@
-   _currentMenu = currentMenu;
-   _level       = level;
- 
--  if (xml != NULL && xml->Type() == TiXmlNode::ELEMENT) {
-+  if (xml != NULL && xml->Type() == TiXmlNode::TINYXML_ELEMENT) {
-      const char *tag = xml->Value();
- 
-      if (cSubMenuNode::IsType(tag) != cSubMenuNode::UNDEFINED) {
-diff -Naur vdr-1.6.0.orig/submenu.h vdr-1.6.0/submenu.h
---- vdr-1.6.0.orig/submenu.h	2010-12-29 14:58:18.000000000 +0100
-+++ vdr-1.6.0/submenu.h	2010-12-29 15:01:50.000000000 +0100
-@@ -17,7 +17,9 @@
- 
- #include "thread.h"
- #include "tools.h"
--#include "tinystr.h"
-+#define TIXML_USE_STL
-+#include <tinystr.h>
-+#include <tinyxml.h>
- 
- class cSubMenuNode;
- class cSubMenuNodes;
diff --git a/media-video/vdr/files/vdr-1.6.0-use-v4l2.patch b/media-video/vdr/files/vdr-1.6.0-use-v4l2.patch
deleted file mode 100644
index ffc02f4b52f4..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-use-v4l2.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-
-    from Version 1.7.3
-    - Changed cDvbDevice::GrabImage() to use V4L2 (thanks to Marco Schlüßler).
-
-diff --git a/dvbdevice.c b/dvbdevice.c
-index e0b05a1..6aa0056 100644
---- a/dvbdevice.c
-+++ b/dvbdevice.c
-@@ -10,7 +10,7 @@
- #include "dvbdevice.h"
- #include <errno.h>
- #include <limits.h>
--#include <linux/videodev.h>
-+#include <linux/videodev2.h>
- #include <linux/dvb/audio.h>
- #include <linux/dvb/dmx.h>
- #include <linux/dvb/frontend.h>
-@@ -604,69 +604,103 @@ uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int S
-   int videoDev = open(buffer, O_RDWR);
-   if (videoDev >= 0) {
-      uchar *result = NULL;
--     struct video_mbuf mbuf;
--     if (ioctl(videoDev, VIDIOCGMBUF, &mbuf) == 0) {
--        int msize = mbuf.size;
--        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
--        if (mem && mem != (unsigned char *)-1) {
--           // set up the size and RGB
--           struct video_capability vc;
--           if (ioctl(videoDev, VIDIOCGCAP, &vc) == 0) {
--              struct video_mmap vm;
--              vm.frame = 0;
--              if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
--                  (SizeY > 0) && (SizeY <= vc.maxheight)) {
--                 vm.width = SizeX;
--                 vm.height = SizeY;
--                 }
--              else {
--                 vm.width = vc.maxwidth;
--                 vm.height = vc.maxheight;
--                 }
--              vm.format = VIDEO_PALETTE_RGB24;
--              if (ioctl(videoDev, VIDIOCMCAPTURE, &vm) == 0 && ioctl(videoDev, VIDIOCSYNC, &vm.frame) == 0) {
--                 // make RGB out of BGR:
--                 int memsize = vm.width * vm.height;
--                 unsigned char *mem1 = mem;
--                 for (int i = 0; i < memsize; i++) {
--                     unsigned char tmp = mem1[2];
--                     mem1[2] = mem1[0];
--                     mem1[0] = tmp;
--                     mem1 += 3;
--                     }
--
--                 if (Quality < 0)
--                    Quality = 100;
--
--                 dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
--                 if (Jpeg) {
--                    // convert to JPEG:
--                    result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality);
--                    if (!result)
--                       esyslog("ERROR: failed to convert image to JPEG");
--                    }
--                 else {
--                    // convert to PNM:
--                    char buf[32];
--                    snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", vm.width, vm.height);
--                    int l = strlen(buf);
--                    int bytes = memsize * 3;
--                    Size = l + bytes;
--                    result = MALLOC(uchar, Size);
--                    if (result) {
--                       memcpy(result, buf, l);
--                       memcpy(result + l, mem, bytes);
-+     // set up the size and RGB
-+     v4l2_format fmt;
-+     memset(&fmt, 0, sizeof(fmt));
-+     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+     fmt.fmt.pix.width = SizeX;
-+     fmt.fmt.pix.height = SizeY;
-+     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
-+     fmt.fmt.pix.field = V4L2_FIELD_ANY;
-+     if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) {
-+        v4l2_requestbuffers reqBuf;
-+        memset(&reqBuf, 0, sizeof(reqBuf));
-+        reqBuf.count = 2;
-+        reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+        reqBuf.memory = V4L2_MEMORY_MMAP;
-+        if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) {
-+           v4l2_buffer mbuf;
-+           memset(&mbuf, 0, sizeof(mbuf));
-+           mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+           mbuf.memory = V4L2_MEMORY_MMAP;
-+           if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) {
-+              int msize = mbuf.length;
-+              unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-+              if (mem && mem != (unsigned char *)-1) {
-+                 v4l2_buffer buf;
-+                 memset(&buf, 0, sizeof(buf));
-+                 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                 buf.memory = V4L2_MEMORY_MMAP;
-+                 buf.index = 0;
-+                 if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) {
-+                    v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                    if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) {
-+                       memset(&buf, 0, sizeof(buf));
-+                       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                       buf.memory = V4L2_MEMORY_MMAP;
-+                       buf.index = 0;
-+                       if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) {
-+                          if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) {
-+                             // make RGB out of BGR:
-+                             int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height;
-+                             unsigned char *mem1 = mem;
-+                             for (int i = 0; i < memsize; i++) {
-+                                 unsigned char tmp = mem1[2];
-+                                 mem1[2] = mem1[0];
-+                                 mem1[0] = tmp;
-+                                 mem1 += 3;
-+                                 }
-+
-+                             if (Quality < 0)
-+                                Quality = 100;
-+
-+                             dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height);
-+                             if (Jpeg) {
-+                                // convert to JPEG:
-+                                result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality);
-+                                if (!result)
-+                                   esyslog("ERROR: failed to convert image to JPEG");
-+                                }
-+                             else {
-+                                // convert to PNM:
-+                                char buf[32];
-+                                snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
-+                                int l = strlen(buf);
-+                                int bytes = memsize * 3;
-+                                Size = l + bytes;
-+                                result = MALLOC(uchar, Size);
-+                                if (result) {
-+                                   memcpy(result, buf, l);
-+                                   memcpy(result + l, mem, bytes);
-+                                   }
-+                                else
-+                                   esyslog("ERROR: failed to convert image to PNM");
-+                                }
-+                             }
-+                          else
-+                             esyslog("ERROR: video device VIDIOC_STREAMOFF failed");
-+                          }
-+                       else
-+                          esyslog("ERROR: video device VIDIOC_DQBUF failed");
-                        }
-                     else
--                       esyslog("ERROR: failed to convert image to PNM");
-+                       esyslog("ERROR: video device VIDIOC_STREAMON failed");
-                     }
-+                 else
-+                    esyslog("ERROR: video device VIDIOC_QBUF failed");
-+                 munmap(mem, msize);
-                  }
-+              else
-+                 esyslog("ERROR: failed to memmap video device");
-               }
--           munmap(mem, msize);
-+           else
-+              esyslog("ERROR: video device VIDIOC_QUERYBUF failed");
-            }
-         else
--           esyslog("ERROR: failed to memmap video device");
-+           esyslog("ERROR: video device VIDIOC_REQBUFS failed");
-         }
-+     else
-+        esyslog("ERROR: video device VIDIOC_S_FMT failed");
-      close(videoDev);
-      return result;
-      }
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_fontconfig_fontsort.patch b/media-video/vdr/files/vdr-1.6.0_p2_fontconfig_fontsort.patch
deleted file mode 100644
index 88f214d848a8..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_fontconfig_fontsort.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/font.c b/font.c
-index 706a017..72c5ec3 100644
---- a/font.c
-+++ b/font.c
-@@ -482,7 +482,8 @@ cString cFont::GetFontFileName(const char *FontName)
-      FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
-      FcConfigSubstitute(NULL, pat, FcMatchPattern);
-      FcDefaultSubstitute(pat);
--     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
-+     FcResult fresult;
-+     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult);
-      if (fontset) {
-         for (int i = 0; i < fontset->nfont; i++) {
-             FcBool scalable;
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch b/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
deleted file mode 100644
index bebdbba5b2bd..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix building with gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=419165
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2012/06/10
-
-diff -Naur vdr-1.6.0.orig/config.h vdr-1.6.0/config.h
---- vdr-1.6.0.orig/config.h	2012-06-10 17:41:26.000000000 +0200
-+++ vdr-1.6.0/config.h	2012-06-10 17:42:19.000000000 +0200
-@@ -182,7 +182,7 @@
- #ifdef USE_CMDSUBMENU
-                       AddConfig(l);
- #else
--                      Add(l);
-+                      this->Add(l);
- #endif /* CMDSUBMENU */
-                    else {
-                       esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff b/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff
deleted file mode 100644
index 0b9eb5d668d6..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-install only the given value in LINGUAS
-signed-of: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2012/04/15 )
-
-diff -Naur vdr-1.7.27.orig/Makefile vdr-1.7.27/Makefile
---- vdr-1.7.27.orig/Makefile	2012-04-15 15:45:18.000000000 +0200
-+++ vdr-1.7.27/Makefile	2012-04-15 15:46:21.000000000 +0200
-@@ -144,7 +144,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
- 
-@@ -167,7 +167,7 @@
- 
- install-i18n:
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	@(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
-+	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
diff --git a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
deleted file mode 100644
index 7f851f77b05a..000000000000
--- a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru vdr-1.6.0-orig/dvbdevice.h vdr-1.6.0/dvbdevice.h
---- vdr-1.6.0-orig/dvbdevice.h	2009-01-12 14:05:10.000000000 +0100
-+++ vdr-1.6.0/dvbdevice.h	2009-01-12 14:05:52.000000000 +0100
-@@ -15,7 +15,7 @@
- #include "device.h"
- #include "dvbspu.h"
- 
--#if DVB_API_VERSION != 3
-+#if (DVB_API_VERSION != 3) && (DVB_API_VERSION != 5)
- #error VDR requires Linux DVB driver API version 3!
- #endif
- 
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 8cbc4869807d..ffe5b73a4663 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -8,58 +8,23 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 	<use>
-		<flag name="analogtv">Add support for the analogtv plugin</flag>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
-		<flag name="atsc">Support for NorthAmerican Broadcast ( rudimentary )</flag>
 		<flag name="bidi">fribid support, for languages, written from right to left</flag>
-		<flag name="cmdreccmdi18n">loads translated commands and reccommands files if existing</flag>
-		<flag name="cmdsubmenu">Allows the creation of submenus in the commands menu</flag>
-		<flag name="cutterlimit">Limit IO bandwith used for cutting</flag>
-		<flag name="cutterqueue">Adds a queue of recordings to be cutted</flag>
-		<flag name="cuttime">Adjust starttime of cutted recording by length of cut out parts</flag>
 		<flag name="ddepgentry">remove duplicate EPG entries</flag>
-		<flag name="deltimeshiftrec">Auto delete timeshift recordings</flag>
-		<flag name="dolbyinrec">add a dedicated switch to control recording of dolby digital</flag>
-		<flag name="dvbplayer">Use some special mpeg-repacker features. Most usable for old recordings or software output devices.</flag>
-		<flag name="dvbsetup">Setup for AC3 transfer, disable primary tuner</flag>
-		<flag name="dvdarchive">DMH DVD - Archiv ( used by vdr-burn-0.1.0_* )</flag>
-		<flag name="dvdchapjump">Jump on capitels on DMH DVD - Archiv</flag>
-		<flag name="dvlfriendlyfnames">filter file names on recording</flag>
-		<flag name="dvlrecscriptaddon">enhancement for record-script</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="em84xx">Add support for em84xx plugin</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="html">Install HTML documentation</flag>
-		<flag name="iptv">Enables channel parameters for vdr-iptv and other input plugins</flag>
 		<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
 		<flag name="jumpingseconds">skip seconds in played records</flag>
-		<flag name="liemikuutio">Formerly known as AIO (all-in-one) patch, adds some nice must haves, plus changes from extensions patch</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="lnbshare">Enables support for two or more dvb cards sharing the same cable to the lnb</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="noepg">Adds code to selectively disable epg-reception for specific channels</flag>
-		<flag name="osdmaxitems">Support for text2skin</flag>
-		<flag name="parentalrating">Support Parental Rating</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="settime">set system time per script instead of via syscal</flag>
 		<flag name="setup">Enable support for the plugin vdr-setup</flag>
-		<flag name="softosd">Soft OSD fading with FF-Cards</flag>
-		<flag name="sortrecords">allows to change sort order of recordings</flag>
-		<flag name="sourcecaps">Adds the ability to define capabilities of dvb-cards (e.g. card1 can receive Sat @28.2E)</flag>
-		<flag name="syncearly">start live display as soon as possible, not waiting for sync of audio and video</flag>
-		<flag name="timercmd">Adds submenu for user defined commands in timer menu</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="validinput">Signal if it is possible to go left/right in lists with chars &lt; &gt;</flag>
 		<flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves features</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>
diff --git a/media-video/vdr/vdr-1.6.0_p2-r11.ebuild b/media-video/vdr/vdr-1.6.0_p2-r11.ebuild
deleted file mode 100644
index 2f0e60fb7a5b..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r11.ebuild
+++ /dev/null
@@ -1,441 +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_p2-r11.ebuild,v 1.3 2013/05/20 18:16:15 hd_brummy Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n softosd parentalrating"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
-
-IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="72"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-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
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.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
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5
-	dev-util/unifdef
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	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-r4 )
-		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."
-		einfo "Note: all patches must have extension .patch"
-		die || "found obselet local patch handling"
-	fi
-
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX AR
-}
-
-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
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ')
-}
-
-src_prepare() {
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-	epatch "${FILESDIR}"/vdr-1.6.0-ldflags.patch
-	epatch "${FILESDIR}"/vdr-1.6.0-use-v4l2.patch
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	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}"/vdr-1.6.0-makefile-install-header.diff
-
-	sed -i i18n-to-gettext.pl \
-		-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
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-	else
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
-		epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas-v3.diff
-		epatch "${FILESDIR}"/vdr-1.6.0_p2_fontconfig_fontsort.patch
-		epatch "${FILESDIR}"/vdr-1.6.0_p2_gcc-4.7.patch
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		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="channelscan pluginapi pluginmissing streamdevext"
-
-			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 iptv && enable_patch pluginparam
-		use liemikuutio && enable_patch liemiext
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	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 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"
-
-	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
-	doexe i18n-to-gettext.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	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 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 "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 use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	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"
-}
diff --git a/media-video/vdr/vdr-1.6.0_p2-r7.ebuild b/media-video/vdr/vdr-1.6.0_p2-r7.ebuild
deleted file mode 100644
index 0a22e1e76f18..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r7.ebuild
+++ /dev/null
@@ -1,439 +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_p2-r7.ebuild,v 1.7 2013/05/20 18:16:15 hd_brummy Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps livebuffer
-	ttxtsubs timercmd timerinfo validinput yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
-	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
-	cmdreccmdi18n softosd parentalrating"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
-
-IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_V="72"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-EXT_VDR_PV="${PV/_p/-}"
-
-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
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.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
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5
-	dev-util/unifdef
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.4.5
-	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-r4 )
-		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() {
-	use debug && append-flags -g
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX AR
-}
-
-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
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-	epatch "${FILESDIR}"/vdr-1.6.0-ldflags.patch
-	epatch "${FILESDIR}"/vdr-1.6.0-use-v4l2.patch
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	local DVBDIR=/usr/include
-
-	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}"/vdr-1.6.0-makefile-install-header.diff
-
-	sed -i i18n-to-gettext.pl \
-		-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
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-	else
-
-		cd "${S}"
-		# Now apply extensions patch
-		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${fname}"
-
-		# Fix typo in Make.config.template
-		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
-
-		# other gentoo patches
-		# epatch "${FILESDIR}/..."
-		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
-		epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		# Patch necessary for media-plugins/vdr-reelchannelscan
-		# it does not change anything when plugin is not used
-		enable_patch CHANNELSCAN
-
-		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="channelscan pluginapi pluginmissing streamdevext"
-
-			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 iptv && enable_patch pluginparam
-		use liemikuutio && enable_patch liemiext
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
-
-		use iptv && sed -i sources.conf -e 's/^#P/P/'
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		local dir_tmp_var
-		local LOCALPATCHES_SUBDIR=${PV}
-		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
-			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
-				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
-			fi
-		done
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
-		fi
-
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	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.pl
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
-
-	local f
-	rm *vdr-1.4* 2>/dev/null
-	for f in *; do
-		[[ -f ${f} ]] || continue
-		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
-	done
-
-	cd "${S}"
-
-	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 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 "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 use atsc; then
-		ewarn "ATSC is only supported by a rudimentary patch"
-		einfo "and need at least this patch and a plugin installed"
-		einfo "emerge media-plugins/vdr-atscepg"
-	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"
-}