Do not abort compilation wwhen detecting dvb api 5 (headers installed by linux-headers-2.6.28) as that is backward compatible to api version 3, Bug #254269

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r1 i686

13 files changed, 71 insertions, 36 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 2902b669881b..470240a6f102 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,15 @@
 # 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.122 2008/11/11 12:25:46 zzam Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.123 2009/01/12 13:23:01 zzam Exp $
+
+  12 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-dvb-api-5-is-fine.diff, vdr-1.4.6.ebuild, vdr-1.4.7-r10.ebuild,
+  vdr-1.4.7-r11.ebuild, vdr-1.4.7-r12.ebuild, vdr-1.6.0.ebuild,
+  vdr-1.6.0-r1.ebuild, vdr-1.6.0-r2.ebuild, vdr-1.6.0_p1.ebuild,
+  vdr-1.6.0_p1-r1.ebuild, vdr-1.6.0_p2.ebuild:
+  Do not abort compilation wwhen detecting dvb api 5 (headers installed by
+  linux-headers-2.6.28) as that is backward compatible to api version 3, Bug
+  #254269
 
   11 Nov 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.7-r12.ebuild:
   Mark stable on x86.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 414547b73b70..4409f30726d0 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -7,6 +7,7 @@ AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536
 AUX vdr-1.6.0-dxr3-subtitlehack.diff 758 RMD160 f329bc9a66db93b7b723352412e4b6404318223c SHA1 c796c9062d673b07123bf926717f0d1370a5f4bf SHA256 3c150749a01e70111395854a8741b4de4c0fbef92372fcfcfeaa7c10312e5053
 AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6c312f3731cf5aed SHA1 f96b5d2444c5b11a3374274f37492b741d1213de SHA256 e3d9d76d0ede46b93473abe72d05771b02b1e19c380d98c48375e94a5ecab0df
 AUX vdr-add-svdrp-down-0.1.diff 2718 RMD160 5563bac57e73c82b5fa96c4384f76f5b2b300f31 SHA1 f6bdd7d2a4428e493a8bddfb849bbd528c8e7d84 SHA256 ad2126451f04a1924367210444878f2225902e08e93fcb96a8de765eb508711e
+AUX vdr-dvb-api-5-is-fine.diff 452 RMD160 d384cf344ed8d576c5466759d2f874820e416ff2 SHA1 792c1a92e90f1e2793c32ec797a02e9d1fcf6b9b SHA256 6069910e9670818e88be5e84c7ed74c8a6da5631e7a3cf13c862726c320f30ce
 AUX vdr-set-dumpable.diff 734 RMD160 d5a261d121855ac4caa9cb47918850538dc26d88 SHA1 85b037d84c834021146d0c0ef515a90c2457defa SHA256 4ae1734ef10893d573e2079c1604f890ed8ae0415cbf2a0de9843174a27eb442
 DIST VDR-Extensions-Patch-42.tar.bz2 260453 RMD160 1610f9c4d3bcca0361b7906e2d9ce62dcfa066c2 SHA1 9b4af40ffa256b6f3eb5f762b1bebe908acc578e SHA256 18c4993b84b3e7aa02db4fc9929cf7c3c6ccbfe8b680f465bbff011c6fd31f80
 DIST VDR-Extensions-Patch-54.tar.bz2 371669 RMD160 fb05d5ea424a310f1151b7c269bf092abcd16a92 SHA1 8497d2bc68cd8c7695bccbb95425410b7af7edf4 SHA256 34ecf440d0ef100a6f05b552be55bc4936727c5259995847b89e0e1ce8c1d7dd
@@ -23,22 +24,22 @@ DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1
 DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3e9a9e72b56f9411 SHA1 68aed71209630ef69b0be0e16a927076b375f3fc SHA256 7889817f005f9640946b4909763e1598f54897152be36064d817fbcab94dac3f
-EBUILD vdr-1.4.6.ebuild 5905 RMD160 25c10566e7a49ff87ef9c65a5294197bb7d9439c SHA1 829636d304c3761cce232948f13680659551fcbe SHA256 702d24c25615a8d6da1cdada8435d67c98db5b75e96129d964fc322104896cfb
-EBUILD vdr-1.4.7-r10.ebuild 9417 RMD160 0a09d6539fbaffd60e9e6c5987c4d24a32ad8304 SHA1 edadfb0539e86f8eb2fc401420b47ec80d159e73 SHA256 797eadcf31dcf31331bbc27fbeb7b8576409edf1badd0b5e3b5a8146508cc7da
-EBUILD vdr-1.4.7-r11.ebuild 9470 RMD160 afaecbebc8391c923ea2ebc2bc9c1195ea9362d2 SHA1 dc3db0fda600d0fd3ad821baa47841cf3243dc98 SHA256 00ebe8aed66586a52b0cc608beedd887bd86267658b8ae82b60a16ae0fbda04a
-EBUILD vdr-1.4.7-r12.ebuild 9628 RMD160 5b7086f346e73ced8945934ced242d5c91dab9e1 SHA1 a20aba480d9c9c3f150f18660565f2f6d8d91e60 SHA256 dad8b1c7518b57637803814f0af429da775346fdbd8f19e851e187ed168b8ddb
-EBUILD vdr-1.6.0-r1.ebuild 9627 RMD160 10a687fe89372c3146dd4d08188ebe731994f61f SHA1 2a81c3092a64f9ce6a5d18ff0b14213061f5fda9 SHA256 09c6db71c056c9dbce461005646f1874ffaedf12c842a7c5bece36ab55c84e30
-EBUILD vdr-1.6.0-r2.ebuild 9789 RMD160 173130274c5051193dafac74f31a9ffd4608b091 SHA1 64bd4695f47f18f9fb7f7d55a49165ebeb5b9815 SHA256 2991a7a74e09808a6c4942b6ee3e33de50b21d797080eb39e1c8f377cac92db4
-EBUILD vdr-1.6.0.ebuild 9723 RMD160 cee50aa80f6e828b2f30ad04f132e7fa16843ee7 SHA1 5bd44ac51df344d8a5e413ebfe397f3066571b99 SHA256 6f9bdf75b7f3d12b0deec27d9d42234ec7dd6d9dcca4d7e3d5b7ddd4505f1cc2
-EBUILD vdr-1.6.0_p1-r1.ebuild 10159 RMD160 d4b4281498a62e71afca2c18f17157afb00602f8 SHA1 d8e80ca7081099127ad30fd80d25baddf92a95a6 SHA256 7b85b2dd51d06508c9c3a38ec734fa3b5756b16755894c243e777347bb0bcfc0
-EBUILD vdr-1.6.0_p1.ebuild 10059 RMD160 eb16d27043ff95ee6c16ac5e41827e644d7d2ee9 SHA1 749acfd635b6aa02353baa98b32970d5e305b432 SHA256 f611826e4f46c99c3a83c17ac0911d3bb1965d03f7e43858d8e6f06cd5704d0e
-EBUILD vdr-1.6.0_p2.ebuild 10366 RMD160 05f503e01da0e2fee74f4f89c0c204c18cfba701 SHA1 78afedb52bf16d0571cc877e64dc9fe8af62a8d2 SHA256 98453c4453c4c30c79207cead49bcf321bd4c3d63c3fdc5740788301e9085fcb
-MISC ChangeLog 21575 RMD160 99ad81a5ded504bba309d5b96dfe70a5e2854b97 SHA1 8c9bb27a54d302bf934b272caacb48ed69db288b SHA256 622d6d3e360c95e973f814b7b718c7133c45eb3703f66a36572ad0d8d9ea41bf
+EBUILD vdr-1.4.6.ebuild 5951 RMD160 74ae17cb1ddfbe8455ac288af20e22d1d84dc219 SHA1 2b25d39471cc77d94365397373cb241c840b1d20 SHA256 a66b84874a4d658ef05fcfc851881276ff80b2890610e02d2b0c24600a77a268
+EBUILD vdr-1.4.7-r10.ebuild 9466 RMD160 dacf69584d6f5f6994e0ca5dbfe9edc6d46f257d SHA1 ceab7133c463851ce8aa35768275486f4bd99aaf SHA256 2a0bf3676123af42ffe7d15fe38a54a6ff6db299fe12c9efa96ea7855485be83
+EBUILD vdr-1.4.7-r11.ebuild 9519 RMD160 66ebf373f0c2366979fa6fc5555dfe882e285c92 SHA1 a084307edbef3565b35bc54a84ff880f47dbd4bb SHA256 ecd85d25a9772a4251343321a631a125d16b745e43446de1a496af100f347bb1
+EBUILD vdr-1.4.7-r12.ebuild 9677 RMD160 65ae2c82dde3733cfbe2d4086c6e9be42585a988 SHA1 15d966284f1def599ceeb81da70b833a78be51fd SHA256 0fb9ec234ad2be31fdfbb9b16b2ba4b044dbd80c3d268ce47b287c0098eeefe6
+EBUILD vdr-1.6.0-r1.ebuild 9673 RMD160 c8ec304c9f1aac2522a60bd6d0d4aaec92c3dd33 SHA1 2d730c5f3ba58f3959925800af2fb027d5060b15 SHA256 40f0d517649ba575233b59ff9cb5b5ef9ad47d041da31104b14a91b84245fc60
+EBUILD vdr-1.6.0-r2.ebuild 9835 RMD160 be557621c409dca1b80f4e26c65f01f354fd073c SHA1 d3d36727747d7e48cbba8a66848ae900f771c68a SHA256 fec06cf7f3f4e0dc8680c6a3c56455fa388e1541542a44064f8e30372addb463
+EBUILD vdr-1.6.0.ebuild 9769 RMD160 85f60b0306624e2b2952efe1571f9ca12ad55dec SHA1 2a4f1af642b12344ee3656fc4cda7e73c7ae213c SHA256 b55eeb0a0c0bb68cb271f6212acbf3537383ba54f5d28671cd6fc06fb996d9e7
+EBUILD vdr-1.6.0_p1-r1.ebuild 10208 RMD160 83b76af225e80ca2d4060988992557c958b14aea SHA1 d4fff8a81ce114b070d0919041830b50d29e5eaa SHA256 799cd3acb982ad0d4806059cfb9a0e92335bb71a7110f762b88c61fc4e7ad512
+EBUILD vdr-1.6.0_p1.ebuild 10105 RMD160 3805ad4c79b815d3e0b738c3ed6b76b89784daa4 SHA1 be32f8a21a34748abda8c30a6006d5a8eeaddbe4 SHA256 3e8ecf7af46cffa32cb9871e7234ff8e6a0218248365ea740810205a90470b3c
+EBUILD vdr-1.6.0_p2.ebuild 10411 RMD160 96fc4da51085aeea4685a78f3b4a0f7fd909593a SHA1 9244999ad3ea9ca33436eec2335e4b7a4fefa898 SHA256 a3a4735fcd872afe274f35897dcf5e91ed78a47674e4b0b81035575ed9571798
+MISC ChangeLog 22044 RMD160 5dab3d1a017866d4922a6b41b6970151f5e97881 SHA1 c4a778401d5035c221cdfa9b2eb3ae4d4d9301c1 SHA256 9ee6e8d9c1079a1d34cfdd5697fc6abd22ba9cb453e7731253bdc1cc855c0110
 MISC metadata.xml 5205 RMD160 3a468059284ff27b98b985e39125b1e76f7eba1a SHA1 8ccf03aeffc000134407c599d371d218f188ace1 SHA256 f5b7083efeceef8c8aa0d7d23247e14cacae256668b975a9fdc2f2dd6c6d0221
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkZedEACgkQt2vP6XvVdOek/QCfVQXGYQxjYSu8dRPWheJJVhnN
-XIoAn2p58YJzvqevWNTPlY1UZ54eZE8o
-=OuMM
+iEYEARECAAYFAklrRD8ACgkQt2vP6XvVdOdZ6QCg2471oQ4nLLJuutjRPUKtw5Uy
+q94AmwUOp1enTJz5Yc4U70ZbXpYJD/0R
+=8FVl
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
new file mode 100644
index 000000000000..b5657e84636a
--- /dev/null
+++ b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
@@ -0,0 +1,14 @@
+Nur in vdr-1.6.0: audio.o.
+Nur in vdr-1.6.0: .dependencies.
+diff -ru vdr-1.6.0-orig/dvbdevice.h vdr-1.6.0/dvbdevice.h
+--- vdr-1.6.0-orig/dvbdevice.h	2009-01-12 14:05:10.000000000 +0100
++++ vdr-1.6.0/dvbdevice.h	2009-01-12 14:05:52.000000000 +0100
+@@ -15,7 +15,7 @@
+ #include "device.h"
+ #include "dvbspu.h"
+ 
+-#if DVB_API_VERSION != 3
++#if (DVB_API_VERSION != 3) && (DVB_API_VERSION != 5)
+ #error VDR requires Linux DVB driver API version 3!
+ #endif
+ 
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index 616fd75d258d..dd9153349380 100644
--- a/media-video/vdr/vdr-1.4.6.ebuild
+++ b/media-video/vdr/vdr-1.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.11 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.12 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -71,6 +71,7 @@ src_unpack() {
 	fi
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 309389ee4ce5..a1c3fc397407 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
+# Copyright 1999-2009 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.8 2008/11/11 12:10:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.9 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -165,6 +165,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.4.7-r11.ebuild b/media-video/vdr/vdr-1.4.7-r11.ebuild
index a4e9c0d30992..1835c0b84d08 100644
--- a/media-video/vdr/vdr-1.4.7-r11.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r11.ebuild,v 1.2 2008/11/11 12:10:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.3 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -165,6 +165,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
index 847c36d825fb..02d0c7d91aef 100644
--- a/media-video/vdr/vdr-1.4.7-r12.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r12.ebuild,v 1.3 2008/11/11 12:25:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.4 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -165,6 +165,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0-r1.ebuild b/media-video/vdr/vdr-1.6.0-r1.ebuild
index db3996567247..7a6b72de3468 100644
--- a/media-video/vdr/vdr-1.6.0-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.4 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.5 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -159,6 +159,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0-r2.ebuild b/media-video/vdr/vdr-1.6.0-r2.ebuild
index 47347444e50c..c9dc7649c19b 100644
--- a/media-video/vdr/vdr-1.6.0-r2.ebuild
+++ b/media-video/vdr/vdr-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.6 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.7 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -159,6 +159,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0.ebuild b/media-video/vdr/vdr-1.6.0.ebuild
index ef153da2d2f9..27e592e033af 100644
--- a/media-video/vdr/vdr-1.6.0.ebuild
+++ b/media-video/vdr/vdr-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.6 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.7 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -168,6 +168,7 @@ src_unpack() {
 	epatch "${WORKDIR}/vdr-extensions-patch-55-atsc.diff"
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
index 9c0daefc84f4..7e255e4bda0a 100644
--- a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1-r1.ebuild,v 1.3 2008/06/27 13:09:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1-r1.ebuild,v 1.4 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -166,6 +166,7 @@ src_unpack() {
 	cd "${S}"
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0_p1.ebuild b/media-video/vdr/vdr-1.6.0_p1.ebuild
index 7f8455f27a15..138e89621aba 100644
--- a/media-video/vdr/vdr-1.6.0_p1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.7 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.8 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -166,6 +166,7 @@ src_unpack() {
 	cd "${S}"
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0_p2.ebuild b/media-video/vdr/vdr-1.6.0_p2.ebuild
index 7df245fee404..5ed0335e8be8 100644
--- a/media-video/vdr/vdr-1.6.0_p2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.2 2008/09/16 18:10:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.3 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -169,6 +169,7 @@ src_unpack() {
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
 	epatch "${DISTDIR}/${MY_P}-2.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
@@ -196,6 +197,7 @@ src_unpack() {
 	eend 0
 
 	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
+
 	if use dxr3; then
 		einfo "Applying dxr3 subtitle hack"
 		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff