Include cdda_interface.h for cdda_paranoia.h wrt #257607

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 28 insertions, 8 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 85cc3d8a96b0..26a869599b32 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.93 2009/04/29 14:33:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.94 2009/04/30 08:34:08 ssuominen Exp $
+
+*cdparanoia-3.10.2-r3 (30 Apr 2009)
+
+  30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +files/cdparanoia-3.10.2-include-cdda_interface_h.patch,
+  -cdparanoia-3.10.2-r2.ebuild, +cdparanoia-3.10.2-r3.ebuild:
+  Include cdda_interface.h for cdda_paranoia.h wrt #257607
 
   29 Apr 2009; Brent Baude <ranger@gentoo.org> cdparanoia-3.10.2-r2.ebuild:
   stable ppc64, bug 267726
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index dd547a5980ea..3d33bdd365d5 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,4 +1,5 @@
 AUX cdparanoia-3.10.2-Makefile.in.patch 3559 RMD160 86c0762fb313558a4756137616dac46e9feb75cc SHA1 ef421e719c1a696806669e70a353a4bc39953d5a SHA256 2335a43de616287cc0d70faac4debc093a7f597306d512e865a0ba4b333d1963
+AUX cdparanoia-3.10.2-include-cdda_interface_h.patch 447 RMD160 0b30b61d8df76420e491af85464c72b3753a86da SHA1 67e9c6a05bd942d35736b4a597ef21695ccc7ab9 SHA256 d85b5997954283696202d403f8adcabba265381b797e656ef8e6fb90807de73c
 AUX cdparanoia-3.10.2-ppc64.patch 547 RMD160 e2e4d14873b3d4ad20cd68774ad68fec0c0caffd SHA1 946e045260d67b4f1788726e7776f6fd41516599 SHA256 64152830e0483444a4323b39ebcac52d09172e65e84c0df0f43b5285c3e073ba
 AUX cdparanoia-3.10.2-use-destdir.patch 2547 RMD160 a9faefb416ead6f19b529449e66dcf3cfd3c2606 SHA1 7200044af3d9e7cdfea1aa5d8cd599e824698aa4 SHA256 41b039b07a1f57271ef3a6587cc104b549e57f15281ee26172c994a8616aca64
 AUX cdparanoia-3.10_pre0-Makefile.in.patch 3584 RMD160 10ac6ad1a8527fc5da86884cecbd7b7cd92c4900 SHA1 fc42f969bb256693608e4fe3722aedeb5073dc5a SHA256 7dd769f0aca16d6b7d83a07e3d76b64f2294b6ed0a6aeaa84fd0b7348369ffcb
@@ -7,7 +8,7 @@ AUX cdparanoia-3.10_pre0-use-destdir.patch 2642 RMD160 e51cb050ba0fbdab19d37b39e
 DIST cdparanoia-3.10.2-gcc43.patch.bz2 4281 RMD160 8a190d57be6d5c37930161dec65e62ffcf0cb5eb SHA1 ce11055564fbef6b8ec952594d150eee4afd52bd SHA256 5ee177a42759f623279d23a0e6466ee064604487c6238c3336f059c20690f376
 DIST cdparanoia-III-10.2.src.tgz 183236 RMD160 d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55 SHA1 1901e20d3a370ca6afa4c76a9ef30d3f03044320 SHA256 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
 DIST cdparanoia-III-10pre2.src.tgz 172099 RMD160 47249f1eb544ff9792bbcbdfab4feefd5b349d2c SHA1 28715586aceacdc26dfa0038b48d01d47296fd54 SHA256 2fc4a9bc0a283af1cb7a9ce3173dab3938dff0fd05127ac610bb7532c0d28762
-EBUILD cdparanoia-3.10.2-r2.ebuild 1285 RMD160 f1b3e5506e1a4cc47e6700c5596294796f88299e SHA1 99907783eccfbf443f3e3e9db41cbd76b3db4ed6 SHA256 17ac2914f392b874fde8e1769e949d2a6129ac21fc7bd88c5dd4883bcf07956f
+EBUILD cdparanoia-3.10.2-r3.ebuild 1342 RMD160 0f76f0e45fae2d1bf0e86fedf4780bd0a7131745 SHA1 b6aa22a4c852f209941c82df96fb9055e877b8e3 SHA256 ce7151769310ad33f8a28c5c11e71896ee558b65965c22f393f77af63cbc1075
 EBUILD cdparanoia-3.10_pre2.ebuild 1291 RMD160 0184827c0f81e4ee7b12d2a0327b01a99eddb235 SHA1 886712392c03f33ed85c87347758df91829be19c SHA256 4176afda3455375d0b41a58196e61119a431ad80493cd2e5e8a6bdc06fc8be4c
-MISC ChangeLog 14743 RMD160 a3c740f679b903e165cb84d2ce31dc343e1a8097 SHA1 7eaba513cf7b3536f9b6bf67aafede64bb8f3f8f SHA256 8f098d27cce79ad64d6051926b4c151febb31125cc4525a30919d158a440f118
+MISC ChangeLog 15018 RMD160 877fc8e986677be6781cca0d2f9cf9e42ba81c0d SHA1 afa1c38a7230950a1cd27d4ad4fa22262c86249a SHA256 0bdc4399f7bc873e772b98c8c0fed66fd628f31c92356df746202145eae338c9
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r2.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
index 6a241eff7ce7..1ab121a1db17 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r2.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r2.ebuild,v 1.4 2009/04/29 14:33:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.10.2-r3.ebuild,v 1.1 2009/04/30 08:34:08 ssuominen Exp $
 
 EAPI=2
 
@@ -21,10 +21,11 @@ IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-use-destdir.patch" \
-		"${FILESDIR}/${P}-Makefile.in.patch" \
-		"${WORKDIR}/${P}-gcc43.patch" \
-		"${FILESDIR}/${P}-ppc64.patch"
+	epatch "${FILESDIR}"/${P}-use-destdir.patch \
+		"${FILESDIR}"/${P}-Makefile.in.patch \
+		"${WORKDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-ppc64.patch \
+		"${FILESDIR}"/${P}-include-cdda_interface_h.patch
 
 	mv configure.guess config.guess
 	mv configure.sub config.sub
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.10.2-include-cdda_interface_h.patch b/media-sound/cdparanoia/files/cdparanoia-3.10.2-include-cdda_interface_h.patch
new file mode 100644
index 000000000000..facc197151c7
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.10.2-include-cdda_interface_h.patch
@@ -0,0 +1,11 @@
+diff -ur cdparanoia-III-10.2.orig/paranoia/cdda_paranoia.h cdparanoia-III-10.2/paranoia/cdda_paranoia.h
+--- cdparanoia-III-10.2.orig/paranoia/cdda_paranoia.h	2008-09-11 20:09:40.000000000 +0000
++++ cdparanoia-III-10.2/paranoia/cdda_paranoia.h	2009-04-30 11:21:26.000000000 +0000
+@@ -39,6 +39,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <cdda_interface.h>
+ 
+ extern char *paranoia_version();
+ extern cdrom_paranoia *paranoia_init(cdrom_drive *d);