vdr-1.4.7-r10 stabel on x86; cleanup old versions

Package-Manager: portage-2.1.3.19

19 files changed, 21 insertions, 3695 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 7b9c71787aa6..cb50fe15a2f9 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.102 2008/02/10 18:34:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.103 2008/02/10 21:18:08 hd_brummy Exp $
+
+  10 Feb 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-1.2.6-gentoo.diff, -files/vdr-1.2.6_CAN-2005-0071.patch,
+  -files/extensions-patch-32-plugin-link-error.diff, -vdr-1.2.6-r1.ebuild,
+  -vdr-1.3.36-r3.ebuild, -vdr-1.4.1-r2.ebuild, -vdr-1.4.3.ebuild,
+  -vdr-1.4.4.ebuild, -vdr-1.4.4_p3.ebuild, -vdr-1.4.5.ebuild,
+  -vdr-1.4.7-r4.ebuild, -vdr-1.4.7-r5.ebuild, -vdr-1.4.7-r6.ebuild,
+  -vdr-1.4.7-r7.ebuild, -vdr-1.4.7-r8.ebuild, -vdr-1.4.7-r9.ebuild,
+  vdr-1.4.7-r10.ebuild:
+  vdr-1.4.7-r10 stabel on x86; cleanup old versions
 
   10 Feb 2008; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.4.7-r10.ebuild:
   added test for multiple menu manipulation ; bug 201601
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 162a5fb36a4c..96815c15474a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,56 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX extensions-patch-32-plugin-link-error.diff 736 RMD160 b6d6b47ed63eff1d3ed73b32953d16cfea12e685 SHA1 37f7e514befa0db291610133f91daa2170c1550c SHA256 c28dc63ecb981a6bc21402c59011920ab139be85380e660e400ba1e3716af3fd
-AUX vdr-1.2.6-gentoo.diff 1995 RMD160 e166ae3db608588fbc3b753764d1e5819a5c4549 SHA1 f64c3f672ecf90e31d4251421503e9e3391cd6bf SHA256 5c7380e402a1a835e91c5b13aeea6f5dbe589d7ed35b7b28753120d69998515c
-AUX vdr-1.2.6_CAN-2005-0071.patch 893 RMD160 c4d69f1dd47366cfb4677b68fb20e304d8e54b23 SHA1 ac9dc591089cfd657f12145becf7f2ffdbe38d40 SHA256 71e3a77382b3da544f3c623263dcf6fa0df5c4ad0126da9d2ef558542dd3cec5
 AUX vdr-1.4.7-makefile-destdir.diff 1554 RMD160 642ff610a1667d39b55736a6a702eba6e2eba4cf SHA1 f773f63d7aebc59133e4accd36c87bf6feefb189 SHA256 e926ca80b87585d59698c05b48b0464e4e72913c4adfbb912541ebacf58d3d25
 AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536b9441d8dd24370f SHA1 7c195bad6928429fa198bf1788c523b3be837812 SHA256 12411dc054993209967d6e09677733430f3b3d963f565debdaae087bbc89e961
 AUX vdr-add-svdrp-down-0.1.diff 2718 RMD160 5563bac57e73c82b5fa96c4384f76f5b2b300f31 SHA1 f6bdd7d2a4428e493a8bddfb849bbd528c8e7d84 SHA256 ad2126451f04a1924367210444878f2225902e08e93fcb96a8de765eb508711e
 AUX vdr-set-dumpable.diff 734 RMD160 d5a261d121855ac4caa9cb47918850538dc26d88 SHA1 85b037d84c834021146d0c0ef515a90c2457defa SHA256 4ae1734ef10893d573e2079c1604f890ed8ae0415cbf2a0de9843174a27eb442
-DIST VDR-Extensions-Patch-32.tar.bz2 217019 RMD160 43ec5662a51885589ecc37594b3806342b8e1698 SHA1 46c481f1c338979e62ec5c2623966fe918bd75bf SHA256 7d2caea7b47cc8eeb86b2539fea1dfeae1d0ec32d5162756f59c0ec6efb45ab1
-DIST VDR-Extensions-Patch-41.tar.bz2 261240 RMD160 21ee6bf535551bc7d39b981d48feb20638fcb5cf SHA1 0290f4e87b85abbd2cfd9c72eb24f7a4ff964f14 SHA256 f9f90bf352a8e5d1491124c0da74b7b731d4ed6708a9af14325a60328e191513
 DIST VDR-Extensions-Patch-42.tar.bz2 260453 RMD160 1610f9c4d3bcca0361b7906e2d9ce62dcfa066c2 SHA1 9b4af40ffa256b6f3eb5f762b1bebe908acc578e SHA256 18c4993b84b3e7aa02db4fc9929cf7c3c6ccbfe8b680f465bbff011c6fd31f80
-DIST gentoo-vdr-patchset-1.4.1-2.tar.bz2 174198 RMD160 cf4985f303dbd5b4923e67ab26f4654cb52d6e8b SHA1 8da1918018f9c169ed1d3f1d5d57606cd02842d1 SHA256 214ac208c8ad61065b23cc59b7ca60c2e9b5cccf742e2767ca8260de5b9e9d0f
-DIST gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914 RMD160 4325ddb158834dd8208c5222d60339ef1a52b898 SHA1 f6ec90cc77bbd95c25f9ae0c59c7588d95d837e5 SHA256 e429f1e09cf416e5bb56ed8a4602e4713755e465692b4ea0a9cb604570b98e12
-DIST gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290 RMD160 27b7210395ddf9697b70e3f1e6065bb495093edb SHA1 97f79463374429c622f9b6ee21b6c901d9f753d0 SHA256 479153c6fc5b2b0eb7ddca17e12568c7469ad296929b874e75b4b58e59deb1cb
-DIST gentoo-vdr-patchset-1.4.4_p3-1.tar.bz2 174196 RMD160 2c456191a0b32b75c7cb20d3697b8034257da657 SHA1 1e77c2d5432c5336f6509a19bca3e3b91c00e603 SHA256 8839c54f155e6a5483808794b46345c89f50d55e6d044dae36c2b61e919d6bbc
-DIST gentoo-vdr-patchset-1.4.5-1.tar.bz2 153726 RMD160 c69eefeec451dc253e49001aec9ec6fc3011ac30 SHA1 39a88c9cb2b22c76c721c744e24aed923aa041b3 SHA256 e2966e1edfdad08ede3db2ba05113c55a187c9cbb72775eb7414c3a7623ecfd7
 DIST gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896 RMD160 c122a082605841410fb5497cd5671f965bdfe3fe SHA1 c13bc1769f36ece50fe4c1a183f3d2bd9e871ca3 SHA256 68be18b4409211e3303eff3f67e75a4ac844f48a89d8fee453e19c143ae79f9a
-DIST vdr-1.2.6.tar.bz2 367069 RMD160 6780bedb49676cecfcea1275d9166e88fb93b97f SHA1 31896db8b3d98c54acdbee34338fd48c067a15bf SHA256 9d969043018d9578970c5d79e048e21870207042f6041a49996aad0c679b24d5
-DIST vdr-1.3.36-gentoo-patchset-0.2.tar.bz2 174683 RMD160 022c8afcd9ccea73cc8b7de2fb14f10a6ef9514a SHA1 585e62c9f57ebc8d598d8bc70b659f5d5a761238 SHA256 6a5e4d21808cc188a950f7c4bbd2edf23e65cdb5cc68871ba8c2f355550da857
-DIST vdr-1.3.36.tar.bz2 513639 RMD160 3bbf1a98f81f35af1768b83b0749b4e12b47bf57 SHA1 69b62aa6f83b9ed2d417ad60ccba37ed74175a43 SHA256 bc79c9212f59127a379c7e4de5a9ff7741eaa2478a6eab0f58c93efadc11b901
-DIST vdr-1.4.1.tar.bz2 553580 RMD160 d23eef3bce7e0604051633f8f93c39e7b046bd9b SHA1 fe77932dff4a92f547d9f7e3fdbd798a7ba27b67 SHA256 a4595c6a5d5f3008e93062444f8b69ca1bec2c977cc536f650c31418164722c7
-DIST vdr-1.4.3.tar.bz2 557370 RMD160 15d8d8bc4d235de30b0b5fc8abd03a7b29627e75 SHA1 7a3f17c242e557fc95921e6884adc194fc4620bb SHA256 ce39b57945321757f4ae743345b4abb37867bcf9a7dba5d8de3581bd49fad247
-DIST vdr-1.4.4.tar.bz2 559362 RMD160 436cbbfb09f4e31f34db4038771fa7bac11230a1 SHA1 7699291f28e63d126842c7ff79170856b2e0abb6 SHA256 d05ae4529d55ad577394239223b83d13a3d11c2c3aa0599896ccba8f67a01b36
-DIST vdr-1.4.5.tar.bz2 560509 RMD160 0c002a3a7270af20524708c5f5dba91c41b8440b SHA1 4693f6f5c9240c067de3b5f50a05dba5d2b25a41 SHA256 ca69b84ae30d7d63b2e54182c389639680ee0c88ab50b8458a994331072f89b2
 DIST vdr-1.4.6.tar.bz2 561236 RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d SHA1 084c6c937aa64fd3339f87d3f56b53fa701b0d28 SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c
 DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SHA1 11e8976b3480a0c9cf2b2aec88c329e9bb0f701b SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464
-DIST vdr-extensions-patch-34.1.tar.bz2 209193 RMD160 13b69a7c5e60d7faf2da529406b50541bcb59fbb SHA1 965c59d94da84152ead2646a4117074d88ff33e3 SHA256 f497a3bc0db019fd830c5de9b9b4cbc1e1056d1fd528dc4bb73b1975ee1688f0
-DIST vdr-extensions-patch-34.2.tar.bz2 212582 RMD160 533e063149d16e2e4c15a63c9a675d8dd5a1aec1 SHA1 a74a8424c61286042485a0a6e77846fb2eef7e08 SHA256 16a0e7c2111dc7bb0c3c76cfb43a05413ef1736461229810e9b02ae6561b0f45
-DIST vdr-extensions-patch-37.1.tar.bz2 322069 RMD160 34e5302c797c594273f3c25ee1522db02198cf14 SHA1 84ab75433ae51a486be95db64d15843b937df4e8 SHA256 294ed21979a5631040a33ee6474b6f580391f8ec25ef4ef60846088abe6a654c
-EBUILD vdr-1.2.6-r1.ebuild 1232 RMD160 00ab8946a7b5a9e6377781f44efeeca4a267b147 SHA1 99b59d6cc627e7d114565eedd12e3ac529c04b97 SHA256 e2e30c00944a9f3d2e2d65c029182801f78505b292d199555b9b97366ada1294
-EBUILD vdr-1.3.36-r3.ebuild 4757 RMD160 ecd5e20bb7d1d85d9e87d2bef1b33a04d9e4154b SHA1 cb402ab894f8ce71efb7213cc3922300883b83b0 SHA256 302b7ce4d27af6f719129c7a83ea993f2f4076c74ecef44a0fa9fdab57ef8e94
-EBUILD vdr-1.4.1-r2.ebuild 6318 RMD160 48952b311a92f6adac8cad8e0101256ef8d0fa73 SHA1 41e99e06da33fd3ed3727b992330c0d718a0fa9e SHA256 dbb9744dd8cd7e79f4f8ddb85e39da1afd47e2df1558d9d36506a24d463b3359
-EBUILD vdr-1.4.3.ebuild 6319 RMD160 f4400007aff1df93f9fe3fa77cd73bffbbd7d436 SHA1 5a01dcbdc2e325c5f12de1849e6a2d03ab94bacc SHA256 217a8865e8c142c2149774c44ce559d09451cb824332fe2d45178ac33b82bb33
-EBUILD vdr-1.4.4.ebuild 4971 RMD160 298e291914cc5cc18e291b416b67d7a576b11f51 SHA1 0b30b35a5f787af586c8f1052f0dba9d49620c13 SHA256 4a7256c31ebb16eb8541eb1c7d475bf2e9ff380d867e18364a01ecef80d9f578
-EBUILD vdr-1.4.4_p3.ebuild 5302 RMD160 b676a429126a3642147101124a1c04e43e149a77 SHA1 e259fad8773ebff123f4205be6fa2ed9b5387b26 SHA256 5d84c46b5b8438412f0afcf142104f7c74aba2442ba119409be271e592983b92
-EBUILD vdr-1.4.5.ebuild 5298 RMD160 b1b3c293b3ef8c043642e773ff6a441dc1267d75 SHA1 9044ff13aa3eaa6d71d66ab4ecdf85e1830ae29f SHA256 7320f1b91ae33faeac01d0162b07001cd089f5911e7f57fabbd9183ff7ef5623
 EBUILD vdr-1.4.6.ebuild 5652 RMD160 7ff1ac174567addba81e261c15d1b4d7b21559cb SHA1 ebbd9ddeac7ad9234c512fbebfc2cfb9e7959a2f SHA256 a6eb0ac715f391f2738d29ba9eb1c123939831747fba2ec7f33ef4799542ae98
-EBUILD vdr-1.4.7-r10.ebuild 9021 RMD160 239e7ae212bb0eaeaea1e61fbbd3dbe34c509dc8 SHA1 dd11ffa49e1c8c908e6e2c63e5972e7b25a4f5e5 SHA256 64575146b95aa839317496292d389e17d6ad67a4f7e456335a6398dd0cf35114
-EBUILD vdr-1.4.7-r4.ebuild 8780 RMD160 a3a4b11269b3adfe6909e9602b7e10b216d11d41 SHA1 c8a51b26c3ee947dfa880f3e6dd05749afd8d0b1 SHA256 8f52cb28020c2a2da9662e83f6733db6d5c4169eba11aa724603d9333389f63f
-EBUILD vdr-1.4.7-r5.ebuild 8477 RMD160 74c755c0bfc588f90e560ca2f0cee428fed77319 SHA1 d7164ea0851023260f984dad30f2b97f6fdc78b1 SHA256 0e06c75080b6d6bef0bb5d477b4c11f93cf53f5ce6b182617fd71d9aec4cc5fb
-EBUILD vdr-1.4.7-r6.ebuild 8546 RMD160 8f69201593c66026943178447081da7bcfd406dc SHA1 980d8773646743a24bf4c0679c652fbcc70240ba SHA256 5db740d87f893af23469d640953b9448cf30e5bbb67f2c426c3be7469b4ba0ad
-EBUILD vdr-1.4.7-r7.ebuild 8607 RMD160 843525e547d0c3abe89d8a86c531acc91c93b856 SHA1 963a4426231366fb652a4390524f64812a23d5af SHA256 1274858f6aaef5cdc87f1a81044ea2d85db1c5441e757ee46ca52d9bc6ce5cdb
-EBUILD vdr-1.4.7-r8.ebuild 8565 RMD160 53a1c162dda8a181f7f795a539d327dc0924a2d6 SHA1 227671135204804959d6fe448273d2aefc2370ca SHA256 a0cb841fb4b8ffa6db749022f41098f631c2de62ee47a0fc594070373dda90c1
-EBUILD vdr-1.4.7-r9.ebuild 8734 RMD160 62a2ea2eb18b9d5c960fc1f7a5e964e41c328756 SHA1 ec616fe814da5e74a17d5e60ef5a57ab22ad6311 SHA256 1a87415c53d4dbec54efa8066af9e029c6282f632b77b38d0b695830ba8bf261
-MISC ChangeLog 17203 RMD160 282596597f25731865f408a73918cdbd8a66317c SHA1 174292439b3f6768ecfc28b3ed2d54afd66a75de SHA256 b66ecca2ad335b713a7f116c33377ba5073f0b9f8e669e0a964d684ca3ca3fce
+EBUILD vdr-1.4.7-r10.ebuild 9031 RMD160 d4d7216123e644b513318204df90898f0b44cf7d SHA1 2a958835a83f2786f63caab1d35dc632a12b1d2d SHA256 62c8068e6a11dd61d5ecf775403b0b4bc7aaa51ea5835a5a9fe26080ddb353e5
+MISC ChangeLog 17744 RMD160 700f5ab7e26fd1924301fca9d8cbedba6c728fa1 SHA1 f4df4c01265fb8b3321fedd76468ac11d33b3d53 SHA256 4f9ad9f238c0a24a022024fb5e7bc85f672d4571cdf9fa7710729739ae29586b
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFHr0Oydn07HTTCgIoRAkWJAKCUk8NN1B4OrD/qvXhyxN0hEDnMPQCeIypJ
-0FU+eBhLXnJGqn6zvVVKHM4=
-=RGZn
+iD8DBQFHr2oZdn07HTTCgIoRAvbdAJ9c9BQCg3aD6ZZqujgYnmj7QhSwSQCgraWt
+lQ165Yei3322KnPP6fyV0S0=
+=HzjT
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/extensions-patch-32-plugin-link-error.diff b/media-video/vdr/files/extensions-patch-32-plugin-link-error.diff
deleted file mode 100644
index ff3a021881d2..000000000000
--- a/media-video/vdr/files/extensions-patch-32-plugin-link-error.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- vdr-1.4.7_extensions.diff	2007-06-24 12:12:15.000000000 +0200
-+++ vdr-1.4.7_extensions-linking.diff	2007-07-05 12:51:06.000000000 +0200
-@@ -7987,6 +7987,18 @@
-    dlls.Add(new cDll(buffer, Args));
-    free(buffer);
-    free(s);
-+@@ -328,7 +336,11 @@ bool cPluginManager::LoadPlugins(bool Lo
-+ {
-+   for (cDll *dll = dlls.First(); dll; dll = dlls.Next(dll)) {
-+       if (!dll->Load(Log))
-++#ifdef USE_PLUGINMISSING
-++         ;
-++#else
-+          return false;
-++#endif /* PLUGINMISSING */
-+       }
-+   return true;
-+ }
- diff -ruN vdr-1.4.7/rcontroller.c vdr-1.4.7-extensions/rcontroller.c
- --- vdr-1.4.7/rcontroller.c	1970-01-01 01:00:00.000000000 +0100
- +++ vdr-1.4.7-extensions/rcontroller.c	2007-06-24 12:25:13.000000000 +0200
diff --git a/media-video/vdr/files/vdr-1.2.6-gentoo.diff b/media-video/vdr/files/vdr-1.2.6-gentoo.diff
deleted file mode 100644
index a5462331e97d..000000000000
--- a/media-video/vdr/files/vdr-1.2.6-gentoo.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -uprN vdr-1.2.6.orig/config.h vdr-1.2.6/config.h
---- vdr-1.2.6.orig/config.h	2005-03-19 18:34:22.799245568 +0100
-+++ vdr-1.2.6/config.h	2005-03-19 18:34:27.120588624 +0100
-@@ -137,7 +137,7 @@ public:
-   bool Save(void)
-   {
-     bool result = true;
--    T *l = (T *)First();
-+    T *l = (T *)cList<T>::First();
-     cSafeFile f(fileName);
-     if (f.Open()) {
-        while (l) {
-diff -uprN vdr-1.2.6.orig/Makefile vdr-1.2.6/Makefile
---- vdr-1.2.6.orig/Makefile	2005-03-19 18:34:22.796246024 +0100
-+++ vdr-1.2.6/Makefile	2005-03-19 18:52:32.140640504 +0100
-@@ -16,8 +16,8 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-vi
- 
- DVBDIR   = ../DVB
- DTVDIR   = ./libdtv
--MANDIR   = /usr/local/man
--BINDIR   = /usr/local/bin
-+MANDIR   = /usr/man
-+BINDIR   = /usr/bin
- 
- PLUGINDIR= ./PLUGINS
- PLUGINLIBDIR= $(PLUGINDIR)/lib
-@@ -121,12 +121,15 @@ plugins-clean:
- # Install the files:
- 
- install:
--	@cp vdr runvdr $(BINDIR)
--	@gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
--	@gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
-+	@mkdir -p $(DESTDIR)$(BINDIR)
-+	@cp vdr runvdr $(DESTDIR)$(BINDIR)
-+	@mkdir -p $(DESTDIR)$(MANDIR)/man1
-+	@mkdir -p $(DESTDIR)$(MANDIR)/man5
-+	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
-+	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
- 	@if [ ! -d $(VIDEODIR) ]; then\
--            mkdir $(VIDEODIR);\
--            cp *.conf $(VIDEODIR);\
-+            mkdir -p $(DESTDIR)$(VIDEODIR);\
-+            cp *.conf $(DESTDIR)$(VIDEODIR);\
-             fi
- 
- # Source documentation:
-diff -uprN vdr-1.2.6.orig/plugin.c vdr-1.2.6/plugin.c
---- vdr-1.2.6.orig/plugin.c	2005-03-19 18:34:22.810243896 +0100
-+++ vdr-1.2.6/plugin.c	2005-03-19 18:34:27.120588624 +0100
-@@ -162,7 +162,7 @@ bool cDll::Load(bool Log)
-   const char *error = dlerror();
-   if (!error) {
-      void *(*creator)(void);
--     (void *)creator = dlsym(handle, "VDRPluginCreator");
-+     creator = (void *(*)())dlsym(handle, "VDRPluginCreator");
-      if (!(error = dlerror()))
-         plugin = (cPlugin *)creator();
-      }
diff --git a/media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch b/media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch
deleted file mode 100644
index d9d573383e63..000000000000
--- a/media-video/vdr/files/vdr-1.2.6_CAN-2005-0071.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- vdr-1.2.6/dvbdevice.c.orig	2005-01-24 14:33:57.478927267 +0100
-+++ vdr-1.2.6/dvbdevice.c	2005-01-24 14:37:04.732811047 +0100
-@@ -505,8 +505,10 @@
-               Quality = 255; //XXX is this 'best'???
- 
-            isyslog("grabbing to %s (%s %d %d %d)", FileName, Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
--           FILE *f = fopen(FileName, "wb");
--           if (f) {
-+           int fd = open(FileName, O_CREAT | O_EXCL | O_TRUNC | O_RDWR, 0600);
-+           if (fd > -1) {
-+             FILE *f = fdopen(fd, "wb");
-+             if (f) {
-               if (Jpeg) {
-                  // write JPEG file:
-                  struct jpeg_compress_struct cinfo;
-@@ -540,7 +542,8 @@
-                     }
-                  }
-               fclose(f);
--              }
-+            }
-+	   }
-            else {
-               LOG_ERROR_STR(FileName);
-               result |= 1;
diff --git a/media-video/vdr/vdr-1.2.6-r1.ebuild b/media-video/vdr/vdr-1.2.6-r1.ebuild
deleted file mode 100644
index fcfebea0d892..000000000000
--- a/media-video/vdr/vdr-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.2.6-r1.ebuild,v 1.7 2007/11/27 11:50:06 zzam Exp $
-
-inherit eutils check-kernel
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/people/kls/vdr"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE="lirc"
-
-DEPEND="sys-libs/ncurses
-	lirc? ( app-misc/lirc )
-	media-libs/jpeg
-	media-tv/linuxtv-dvb-headers"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}_CAN-2005-0071.patch"
-}
-
-src_compile() {
-	local myconf="VIDEODIR=/etc/vdr"
-	use lirc && myconf="${myconf} REMOTE=LIRC"
-	emake ${myconf} || die "make failed"
-}
-
-src_install() {
-	make VIDEODIR=/etc/vdr DESTDIR="${D}" install || die "install failed"
-	dodoc INSTALL README MANUAL CONTRIBUTORS HISTORY
-	dohtml PLUGINS.html
-	dodir /usr/share/doc/${PF}/scripts
-	insinto /usr/share/doc/${PF}/scripts
-	doins "${S}"/epg2html.pl "${S}"/runvdr "${S}"/svdrpsend.pl
-
-	# install header files
-	dodir /usr/include/vdr
-	insinto /usr/include/vdr
-	doins *.h
-}
diff --git a/media-video/vdr/vdr-1.3.36-r3.ebuild b/media-video/vdr/vdr-1.3.36-r3.ebuild
deleted file mode 100644
index 5e095d010310..000000000000
--- a/media-video/vdr/vdr-1.3.36-r3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.36-r3.ebuild,v 1.12 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils
-
-IUSE="aio bigpatch jumpplay lnbsharing sourcecaps yaepg setup-plugin subtitles"
-
-PATCHSET_V=0.2
-PATCHSET_NAME=${P}-gentoo-patchset-${PATCHSET_V}
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/Developer/${P}.tar.bz2
-	mirror://gentoo/${PATCHSET_NAME}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.2.2"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( media-plugins/vdr-setup )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/lib/vdr/plugins
-CONF_DIR=/etc/vdr
-RC_DIR=/usr/lib/vdr/rcscript
-CAP_FILE=${S}/vdr-capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-# works like use to check for active (and not active !abc) useflags
-# if more than one flag is given it returns that all flags are active
-#
-# "use_multi_and a b !c !d"
-# ==
-# "use a && use b && use !c && use !d"
-#
-use_multi_and() {
-	while [[ -n ${1} ]]; do
-		use ${1} || return 1
-
-		shift
-	done
-	return 0
-}
-
-# reads the line GENTOO_USE out of the beginning of the patch
-# example: GENTOO_USE: aio !bigpatch
-# and checks weather the useflags are set appropriate (via use_multi_and)
-# if check returns true the patch is applied
-#
-apply_vdr_patch() {
-	local APPLY=1
-	local p="${1}"
-	debug-print "PATCH:"
-	debug-print "  $(basename ${p})"
-	local V1
-	local V2
-	while read V1 V2; do
-		case ${V1} in
-		GENTOO_USE:)
-			APPLY=0
-			if use_multi_and ${V2}; then
-				APPLY=1
-				break
-			fi
-			;;
-		+++|---|diff|@@)
-			break;
-			;;
-		*)
-			;;
-		esac
-	done < "${p}"
-	[[ ${APPLY} == 0 ]] && return
-	debug-print "    --> applied"
-	epatch "${p}"
-}
-
-# call apply_vdr_patch for all patchfiles in given directory
-
-apply_vdr_patchset() {
-	local p
-	for p in ${1}/*.{diff,patch}; do
-		[[ -f "${p}" ]] || continue
-		apply_vdr_patch "${p}"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-	else
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
-	fi
-
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	apply_vdr_patchset ${PATCHSET_DIR}
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		echo
-		elog "Applying local patches"
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{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_IRCTRL_RUNTIME_PARAM \
-		CAP_VFAT_RUNTIME_PARAM \
-		CAP_SHUTDOWN_SVDRP
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto ${VDR_INCLUDE_DIR}
-	doins *.h
-	doins Make.config
-
-	insinto ${VDR_INCLUDE_DIR}/libsi
-	doins libsi/*.h
-
-	keepdir ${CONF_DIR}/plugins
-
-	insinto ${CONF_DIR}
-	doins *.conf channels.conf.*
-
-	chown -R vdr:vdr "${D}"/${CONF_DIR}
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto ${RC_DIR}
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/PLUGINS/lib
-	fi
-
-	if use setup-plugin; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}
diff --git a/media-video/vdr/vdr-1.4.1-r2.ebuild b/media-video/vdr/vdr-1.4.1-r2.ebuild
deleted file mode 100644
index b8497910bce4..000000000000
--- a/media-video/vdr/vdr-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r2.ebuild,v 1.12 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
-	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
-	child-protection yaepg setup-plugin submenu subtitles rotor"
-
-PATCHSET_V=2
-PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	!vanilla? ( mirror://gentoo/${PATCHSET_NAME}.tar.bz2
-				http://dev.gentoo.org/~zzam/distfiles/${PATCHSET_NAME}.tar.bz2 )"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	!vanilla? ( >=media-tv/gentoo-vdr-scripts-0.3.5 )"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
-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
-}
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-# works like use to check for active (and not active !abc) useflags
-# if more than one flag is given it returns that all flags are active
-#
-# "use_multi_and a b !c !d"
-# ==
-# "use a && use b && use !c && use !d"
-#
-use_multi_and() {
-	while [[ -n ${1} ]]; do
-		use ${1} || return 1
-
-		shift
-	done
-	return 0
-}
-
-# reads the line GENTOO_USE out of the beginning of the patch
-# example: GENTOO_USE: aio !bigpatch
-# and checks weather the useflags are set appropriate (via use_multi_and)
-# if check returns true the patch is applied
-#
-apply_vdr_patch() {
-	local APPLY=0
-	local COUNT_USE=0
-	local CAP=""
-	local p="${1}"
-	debug-print "PATCH:"
-	debug-print "  $(basename ${p})"
-	local V1
-	local V2
-	while read V1 V2; do
-		case ${V1} in
-		GENTOO_USE:)
-			: $((COUNT_USE++))
-			if use_multi_and ${V2}; then
-				APPLY=1
-			fi
-			;;
-		GENTOO_CAP:)
-			CAP="${V2}"
-			;;
-		+++|---|diff|@@)
-			break;
-			;;
-		*)
-			;;
-		esac
-	done < "${p}"
-	if [[ ${COUNT_USE} -eq 0 ]]; then
-		APPLY=1
-	fi
-	[[ ${APPLY} == 0 ]] && return
-	debug-print "    --> applied"
-	epatch "${p}"
-	[[ -n "${CAP}" ]] && add_cap ${CAP}
-}
-
-# call apply_vdr_patch for all patchfiles in given directory
-
-apply_vdr_patchset() {
-	local p
-	for p in ${1}/*.{diff,patch}; do
-		[[ -f "${p}" ]] || continue
-		apply_vdr_patch "${p}"
-	done
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	if ! use vanilla; then
-		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-			ewarn "Using local developer patchset."
-			PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-		else
-			unpack ${PATCHSET_NAME}.tar.bz2
-			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
-		fi
-	fi
-
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	if use vanilla; then
-		ewarn "OK - You are on your own now!"
-		ewarn "no gentoo-patches will be applied!"
-	else
-		apply_vdr_patchset ${PATCHSET_DIR}
-
-		if use setup-plugin && use submenu; then
-			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
-		fi
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		echo
-		elog "Applying local patches"
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_SHUTDOWN_SVDRP \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto ${VDR_INCLUDE_DIR}
-	doins *.h
-	doins Make.config
-
-	insinto ${VDR_INCLUDE_DIR}/libsi
-	doins libsi/*.h
-
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
-
-	insinto ${CONF_DIR}
-	doins *.conf channels.conf.*
-
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/PLUGINS/lib
-	fi
-
-	if use setup-plugin; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}"/${CONF_DIR}
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; then
-		echo
-		eerror "It is very important to emerge media-plugins/vdr-setup now"
-		eerror "and to have it activated in /etc/conf.d/vdr.plugins"
-	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
-}
diff --git a/media-video/vdr/vdr-1.4.3.ebuild b/media-video/vdr/vdr-1.4.3.ebuild
deleted file mode 100644
index d23c35b97047..000000000000
--- a/media-video/vdr/vdr-1.4.3.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.3.ebuild,v 1.11 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
-	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
-	child-protection yaepg setup-plugin submenu subtitles rotor"
-
-PATCHSET_V=1
-PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	!vanilla? ( mirror://gentoo/${PATCHSET_NAME}.tar.bz2
-				http://dev.gentoo.org/~zzam/distfiles/${PATCHSET_NAME}.tar.bz2 )"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	!vanilla? (
-		|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-		>=media-tv/gentoo-vdr-scripts-0.3.5
-	)"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
-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
-}
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-# works like use to check for active (and not active !abc) useflags
-# if more than one flag is given it returns that all flags are active
-#
-# "use_multi_and a b !c !d"
-# ==
-# "use a && use b && use !c && use !d"
-#
-use_multi_and() {
-	while [[ -n ${1} ]]; do
-		use ${1} || return 1
-
-		shift
-	done
-	return 0
-}
-
-# reads the line GENTOO_USE out of the beginning of the patch
-# example: GENTOO_USE: aio !bigpatch
-# and checks weather the useflags are set appropriate (via use_multi_and)
-# if check returns true the patch is applied
-#
-apply_vdr_patch() {
-	local APPLY=0
-	local COUNT_USE=0
-	local CAP=""
-	local p="${1}"
-	debug-print "PATCH:"
-	debug-print "  $(basename ${p})"
-	local V1
-	local V2
-	while read V1 V2; do
-		case ${V1} in
-		GENTOO_USE:)
-			: $((COUNT_USE++))
-			if use_multi_and ${V2}; then
-				APPLY=1
-			fi
-			;;
-		GENTOO_CAP:)
-			CAP="${V2}"
-			;;
-		+++|---|diff|@@)
-			break;
-			;;
-		*)
-			;;
-		esac
-	done < "${p}"
-	if [[ ${COUNT_USE} -eq 0 ]]; then
-		APPLY=1
-	fi
-	[[ ${APPLY} == 0 ]] && return
-	debug-print "    --> applied"
-	epatch "${p}"
-	[[ -n "${CAP}" ]] && add_cap ${CAP}
-}
-
-# call apply_vdr_patch for all patchfiles in given directory
-
-apply_vdr_patchset() {
-	local p
-	for p in ${1}/*.{diff,patch}; do
-		[[ -f "${p}" ]] || continue
-		apply_vdr_patch "${p}"
-	done
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	if ! use vanilla; then
-		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-			ewarn "Using local developer patchset."
-			PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-		else
-			unpack ${PATCHSET_NAME}.tar.bz2
-			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
-		fi
-	fi
-
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	if use vanilla; then
-		ewarn "OK - You are on your own now!"
-		ewarn "no gentoo-patches will be applied!"
-	else
-		apply_vdr_patchset ${PATCHSET_DIR}
-
-		if use setup-plugin && use submenu; then
-			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
-		fi
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		echo
-		elog "Applying local patches"
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_SHUTDOWN_SVDRP \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto ${VDR_INCLUDE_DIR}
-	doins *.h
-	doins Make.config
-
-	insinto ${VDR_INCLUDE_DIR}/libsi
-	doins libsi/*.h
-
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
-
-	insinto ${CONF_DIR}
-	doins *.conf channels.conf.*
-
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/PLUGINS/lib
-	fi
-
-	if use setup-plugin; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}"/${CONF_DIR}
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; then
-		echo
-		eerror "It is very important to emerge media-plugins/vdr-setup now"
-		eerror "and to have it activated in /etc/conf.d/vdr.plugins"
-	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
-}
diff --git a/media-video/vdr/vdr-1.4.4.ebuild b/media-video/vdr/vdr-1.4.4.ebuild
deleted file mode 100644
index 5ec5d2a91733..000000000000
--- a/media-video/vdr/vdr-1.4.4.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.4.ebuild,v 1.11 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
-	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
-	child-protection yaepg setup-plugin submenu subtitles rotor noepg"
-
-PATCHSET_V=1
-PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
-
-MY_P="${P%_p*}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHSET_NAME}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${PATCHSET_NAME}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
-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
-}
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
-	fi
-
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	source ${PATCHSET_DIR}/apply_patchset.sh
-	apply_vdr_patchset "${PATCHSET_DIR}"
-
-	if use !vanilla; then
-		if use setup-plugin && use submenu; then
-			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
-		fi
-	fi
-
-	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
-	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
-		echo
-		elog "Applying local patches"
-		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
-			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
-		done
-	fi
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r "${S}" "${T}"/source-tree
-	fi
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_SHUTDOWN_SVDRP \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto ${VDR_INCLUDE_DIR}
-	doins *.h
-	doins Make.config
-
-	insinto ${VDR_INCLUDE_DIR}/libsi
-	doins libsi/*.h
-
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
-
-	insinto ${CONF_DIR}
-	doins *.conf channels.conf.*
-
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/PLUGINS/lib
-	fi
-
-	if use setup-plugin; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}"/${CONF_DIR}
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; then
-		echo
-		eerror "It is very important to emerge media-plugins/vdr-setup now"
-		eerror "and to have it activated in /etc/conf.d/vdr.plugins"
-	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
-}
diff --git a/media-video/vdr/vdr-1.4.4_p3.ebuild b/media-video/vdr/vdr-1.4.4_p3.ebuild
deleted file mode 100644
index cb901fe261a8..000000000000
--- a/media-video/vdr/vdr-1.4.4_p3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.4_p3.ebuild,v 1.10 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
-	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
-	child-protection yaepg setup-plugin submenu subtitles rotor noepg"
-
-PATCHSET_V=1
-PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
-
-MY_P="${P%_p*}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHSET_NAME}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
-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
-}
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
-	fi
-
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	source ${PATCHSET_DIR}/apply_patchset.sh
-	apply_vdr_patchset "${PATCHSET_DIR}"
-
-	if use !vanilla; then
-		if use setup-plugin && use submenu; then
-			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
-		fi
-	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
-
-		elog
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			elog "Applying local patches"
-		else
-			elog "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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_SHUTDOWN_SVDRP \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto ${VDR_INCLUDE_DIR}
-	doins *.h
-	doins Make.config
-
-	insinto ${VDR_INCLUDE_DIR}/libsi
-	doins libsi/*.h
-
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
-
-	insinto ${CONF_DIR}
-	doins *.conf channels.conf.*
-
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/PLUGINS/lib
-	fi
-
-	if use setup-plugin; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}"/${CONF_DIR}
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; then
-		echo
-		eerror "It is very important to emerge media-plugins/vdr-setup now"
-		eerror "and to have it activated in /etc/conf.d/vdr.plugins"
-	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
-}
diff --git a/media-video/vdr/vdr-1.4.5.ebuild b/media-video/vdr/vdr-1.4.5.ebuild
deleted file mode 100644
index f21a149c28ee..000000000000
--- a/media-video/vdr/vdr-1.4.5.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.5.ebuild,v 1.10 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
-	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
-	child-protection yaepg setup-plugin submenu subtitles rotor noepg"
-
-PATCHSET_V=1
-PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
-
-MY_P="${P%_p*}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2
-	mirror://gentoo/${PATCHSET_NAME}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
-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
-}
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
-	fi
-
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		DVBDIR		 = ${DVB_DIR}
-		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
-		CONFIGDIR	 = ${CONF_DIR}
-
-		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
-	EOT
-	eend 0
-
-	source ${PATCHSET_DIR}/apply_patchset.sh
-	apply_vdr_patchset "${PATCHSET_DIR}"
-
-	if use !vanilla; then
-		if use setup-plugin && use submenu; then
-			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
-		fi
-	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
-
-		elog
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			elog "Applying local patches"
-		else
-			elog "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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_SHUTDOWN_SVDRP \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe vdr
-	doexe svdrpsend.pl
-
-	insinto ${VDR_INCLUDE_DIR}
-	doins *.h
-	doins Make.config
-
-	insinto ${VDR_INCLUDE_DIR}/libsi
-	doins libsi/*.h
-
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
-
-	insinto ${CONF_DIR}
-	doins *.conf channels.conf.*
-
-	keepdir "${PLUGIN_LIB_DIR}"
-
-	doman vdr.1 vdr.5
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		elog "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/PLUGINS/lib
-	fi
-
-	if use setup-plugin; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
-	chown -R vdr:vdr "${D}"/${CONF_DIR}
-}
-
-pkg_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; then
-		echo
-		eerror "It is very important to emerge media-plugins/vdr-setup now"
-		eerror "and to have it activated in /etc/conf.d/vdr.plugins"
-	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
-}
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 897198687f92..7a50e8690eac 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.2 2008/02/10 18:34:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.3 2008/02/10 21:18:08 hd_brummy Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
 
 #http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -60,13 +60,15 @@ pkg_setup() {
 
 check_menu_flags () {
 
+	count=0
+
 	for flag in menuorg setup submenu; do
 		use $flag && count=$((count+1))
 	done
 
 	if [ $count -gt 1 ] ; then
 		echo
-		eerror "Please use only one of this USE-Flags"
+		eerror "Please use only one of these USE-Flags"
 		eerror "submenu setup menuorg"
 		die "multiple menu manipulation"
 	fi
diff --git a/media-video/vdr/vdr-1.4.7-r4.ebuild b/media-video/vdr/vdr-1.4.7-r4.ebuild
deleted file mode 100644
index f5edd18e1354..000000000000
--- a/media-video/vdr/vdr-1.4.7-r4.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r4.ebuild,v 1.4 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter"
-
-IUSE="debug vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="32"
-EXT_P=VDR-Extensions-Patch-${EXT_V}
-EXT_DIR=${WORKDIR}/${EXT_P}/
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
-	dev-util/unifdef"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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"
-}
-
-add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
-	done
-}
-
-enable_patch() {
-	local patch
-	while [ "$1" ]; do
-		patch="$1"
-		echo "$patch = 1" >> Make.config
-		shift
-	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="genfontfile.c $(echo font*.c)"
-	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"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		# changes to extensions-patch to be applicable to vdr-$PV
-		cd "${EXT_DIR}"
-		local LOCAL_EXT_CHANGES="${FILESDIR}/extensions-patch-${EXT_V}-vdr-${PV}.diff"
-		if [[ -f "${LOCAL_EXT_CHANGES}" ]]; then
-			epatch "${LOCAL_EXT_CHANGES}"
-		fi
-		epatch "${FILESDIR}/extensions-patch-32-plugin-link-error.diff"
-
-		cd "${S}"
-		epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		#epatch "${FILESDIR}/${P}-gentoo-hardlinkcutter.diff"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]')
-			use $flag && enable_patch ${FLAG_UP}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make fonts"
-		emake font >/dev/null
-		eend $? "make fonts failed"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		do_unifdef
-	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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-	newdoc ${EXT_DIR}/README README.extensions-patch
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}"/${P}
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}"/${P}/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_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}
diff --git a/media-video/vdr/vdr-1.4.7-r5.ebuild b/media-video/vdr/vdr-1.4.7-r5.ebuild
deleted file mode 100644
index 61bb88914de7..000000000000
--- a/media-video/vdr/vdr-1.4.7-r5.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r5.ebuild,v 1.3 2007/10/08 15:00:18 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter"
-
-IUSE="debug vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="34.1"
-EXT_P=vdr-extensions-patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	mirror://gentoo/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
-	dev-util/unifdef"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg
-	for arg; do
-		echo "${arg} = 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="genfontfile.c $(echo font*.c)"
-	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"
-	done
-	eend 0
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]')
-			use $flag && enable_patch ${FLAG_UP}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make fonts"
-		emake font >/dev/null
-		eend $? "make fonts failed"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		do_unifdef
-	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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY*
-	dodoc TODO-enAIO-rm CONTRIBUTORS
-
-	cd "${EXT_DIR}"/doc
-	local f
-	for f in *; do
-		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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}
diff --git a/media-video/vdr/vdr-1.4.7-r6.ebuild b/media-video/vdr/vdr-1.4.7-r6.ebuild
deleted file mode 100644
index 482160b5b46a..000000000000
--- a/media-video/vdr/vdr-1.4.7-r6.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r6.ebuild,v 1.2 2007/10/19 11:17:16 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter"
-
-IUSE="debug vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="34.2"
-EXT_P=vdr-extensions-patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	mirror://gentoo/${EXT_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
-	dev-util/unifdef"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg
-	for arg; do
-		echo "${arg} = 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="genfontfile.c $(echo font*.c)"
-	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_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]')
-			use $flag && enable_patch ${FLAG_UP}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make fonts"
-		emake font >/dev/null
-		eend $? "make fonts failed"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		do_unifdef
-	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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}"/doc
-	local f
-	for f in *; do
-		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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}
diff --git a/media-video/vdr/vdr-1.4.7-r7.ebuild b/media-video/vdr/vdr-1.4.7-r7.ebuild
deleted file mode 100644
index 8a78460812d4..000000000000
--- a/media-video/vdr/vdr-1.4.7-r7.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r7.ebuild,v 1.1 2007/11/11 15:46:35 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter"
-
-IUSE="debug vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="37.1"
-EXT_P=vdr-extensions-patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	mirror://gentoo/${EXT_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
-	dev-util/unifdef"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg
-	for arg; do
-		echo "${arg} = 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="genfontfile.c $(echo font*.c)"
-	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_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]')
-			use $flag && enable_patch ${FLAG_UP}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make fonts"
-		emake font >/dev/null
-		eend $? "make fonts failed"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}"/doc
-	local f
-	for f in *; do
-		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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}
diff --git a/media-video/vdr/vdr-1.4.7-r8.ebuild b/media-video/vdr/vdr-1.4.7-r8.ebuild
deleted file mode 100644
index 22181b669dec..000000000000
--- a/media-video/vdr/vdr-1.4.7-r8.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r8.ebuild,v 1.1 2007/11/12 15:52:12 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter"
-
-IUSE="debug vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="37.1"
-EXT_P=vdr-extensions-patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	mirror://gentoo/${EXT_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
-	dev-util/unifdef"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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"
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg
-	for arg; do
-		echo "${arg} = 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="genfontfile.c $(echo font*.c)"
-	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_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]')
-			use $flag && enable_patch ${FLAG_UP}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null || die "make depend failed"
-		eend 0
-
-		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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}"/doc
-	local f
-	for f in *; do
-		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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}
diff --git a/media-video/vdr/vdr-1.4.7-r9.ebuild b/media-video/vdr/vdr-1.4.7-r9.ebuild
deleted file mode 100644
index e28d937cb80f..000000000000
--- a/media-video/vdr/vdr-1.4.7-r9.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r9.ebuild,v 1.1 2007/12/23 19:48:07 zzam Exp $
-
-inherit eutils flag-o-matic multilib
-
-IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
-	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
-	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
-	rotor settime setup sortrecords sourcecaps submenu
-	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
-	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter
-	volctrl lircsettings"
-
-IUSE="debug vanilla ${IUSE_EXTENSIONS}"
-
-EXT_V="41"
-EXT_P=VDR-Extensions-Patch-"${EXT_V}"
-EXT_DIR="${WORKDIR}/${EXT_P}/"
-# Set if != $PV
-#EXT_VDR_PV=1.5.3
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.cadsoft.de/vdr/"
-SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-#http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/jpeg
-	sys-apps/gawk
-	media-tv/linuxtv-dvb-headers
-	sys-libs/libcap
-	dev-util/unifdef"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 media-tv/vdrplugin-rebuild )
-	>=media-tv/gentoo-vdr-scripts-0.3.5"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
-
-# Relevant Pathes for vdr on gentoo
-DVB_DIR=/usr/include
-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"
-}
-
-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="genfontfile.c $(echo font*.c)"
-	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_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	ebegin "Changing pathes for gentoo"
-
-	sed \
-	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-	  -i vdr.c
-
-	cat > Make.config <<-EOT
-		#
-		# Generated by ebuild ${PF}
-		#
-		BINDIR			= /usr/bin
-		MANDIR			= /usr/share/man
-		DVBDIR			= ${DVB_DIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		HEADERDIR		= /usr/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
-	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
-
-	sed -i Makefile \
-		-e 's/runvdr//' \
-		-e 's/ install-plugins//'
-
-	if ! use vanilla; then
-
-		cd "${S}"
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
-
-		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
-		add_cap CAP_SHUTDOWN_SVDRP
-
-		epatch "${FILESDIR}/vdr-set-dumpable.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"
-
-			extensions_all_defines > "${T}"/new.IUSE
-			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "IUSE_EXTENSIONS 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 $IUSE_EXTENSIONS; do
-			use $flag && enable_patch ${flag}
-		done
-		eend 0
-
-		extensions_add_make_conf
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null || die "make depend failed"
-		eend 0
-
-		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
-
-	if ! use vanilla; then
-		add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID
-
-		echo -e ${CAPS} > "${CAP_FILE}"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	dohtml *.html
-	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
-
-	cd "${EXT_DIR}"
-	local f
-	rm *vdr-1.5* 2>/dev/null
-	for f in BUGS README* HISTORY* patch.list; do
-		[[ -f ${f} ]] || break
-		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
-		einfo "Installing sources"
-		insinto "${VDRSOURCE_DIR}/${P}"
-		doins -r "${T}"/source-tree/*
-		keepdir "${VDRSOURCE_DIR}/${P}"/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_postinst() {
-	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; 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
-}