Fix bad reference to OSS headerfile. Closes bug #81864.

Package-Manager: portage-2.0.51-r15

4 files changed, 36 insertions, 15 deletions

diff --git a/media-plugins/xmms-cdaudio/ChangeLog b/media-plugins/xmms-cdaudio/ChangeLog
index ddd63c26fd75..ce922b5f83b3 100644
--- a/media-plugins/xmms-cdaudio/ChangeLog
+++ b/media-plugins/xmms-cdaudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/xmms-cdaudio
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-cdaudio/ChangeLog,v 1.1 2005/02/12 02:26:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-cdaudio/ChangeLog,v 1.2 2005/02/13 20:59:01 eradicator Exp $
+
+  13 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-cdaudio-1.2.10-r1.ebuild, xmms-cdaudio-1.2.10.ebuild:
+  Fix bad reference to OSS headerfile.  Closes bug #81864.
 
 *xmms-cdaudio-1.2.10-r1 (11 Feb 2005)
 
diff --git a/media-plugins/xmms-cdaudio/Manifest b/media-plugins/xmms-cdaudio/Manifest
index 53ce3d703337..2bd982fd1fe7 100644
--- a/media-plugins/xmms-cdaudio/Manifest
+++ b/media-plugins/xmms-cdaudio/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 2b0ae26e5dcda3d75397bf009cd67ad8 xmms-cdaudio-1.2.10.ebuild 533
-MD5 7d0d7592c4b466a2c612b160d56ec669 xmms-cdaudio-1.2.10-r1.ebuild 555
-MD5 b6a6214529f002be2ff93e55184fddfe ChangeLog 457
+MD5 683084c7351130bc437b69ca48221f4b xmms-cdaudio-1.2.10.ebuild 717
+MD5 dcf18b8590213816142617a51d09941e xmms-cdaudio-1.2.10-r1.ebuild 738
+MD5 8e35e0d1ec4f6593476c28e0f5aa98da ChangeLog 635
 MD5 af2d409c36e9f3caee63715699f1ce44 files/digest-xmms-cdaudio-1.2.10 142
 MD5 ee4c50bc643c29df08e03dffa42613b8 files/digest-xmms-cdaudio-1.2.10-r1 227
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCDXDtArHZZzCEUG0RAlpKAJ9ynWS0izAvsAnBfbaZJ1NcXWdWRQCeMJ8L
-JKf3rQQDnZZnp916LZSe/UI=
-=KRSa
+iD8DBQFCD7+jArHZZzCEUG0RAvDPAJ9ZTCfmWVqAMe2VDGrVkX/8E9eQQgCcCLSk
+U13GOEboR/e2k96HDp+r9pw=
+=sGZF
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10-r1.ebuild b/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10-r1.ebuild
index 7003a242a9a9..837e18789ef0 100644
--- a/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10-r1.ebuild
+++ b/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10-r1.ebuild
@@ -1,22 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10-r1.ebuild,v 1.2 2005/02/12 02:58:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10-r1.ebuild,v 1.3 2005/02/13 20:59:01 eradicator Exp $
 
-IUSE="ipv6"
+IUSE="ipv6 oss"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND=">=media-sound/xmms-1.2.10"
 
-PATCH_VER="2.2.2"
-
 PLUGIN_PATH="Input/cdaudio"
 
+PATCH_VER="2.2.2"
 M4_VER="1.0"
 
 inherit xmms-plugin
 
+src_unpack() {
+	xmms-plugin_src_unpack
+
+	cd ${S}/${PLUGIN_PATH}
+	cp ${S}/Output/OSS/soundcard.h .
+
+	sed -i 's:<Output/OSS/soundcard.h>:"soundcard.h":' *.{h,c}
+}
+
 src_compile() {
-	myconf="${myconf} --enable-cdaudio $(use_enable ipv6)"
+	myconf="${myconf} --enable-cdaudio $(use_enable ipv6) $(use_enable oss)"
 	xmms-plugin_src_compile
 }
diff --git a/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10.ebuild b/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10.ebuild
index 3282b4f4f03b..5c7e163f1ed7 100644
--- a/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10.ebuild
+++ b/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10.ebuild,v 1.2 2005/02/12 02:58:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-cdaudio/xmms-cdaudio-1.2.10.ebuild,v 1.3 2005/02/13 20:59:01 eradicator Exp $
 
-IUSE="ipv6"
+IUSE="ipv6 oss"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
@@ -14,7 +14,16 @@ M4_VER="1.0"
 
 inherit xmms-plugin
 
+src_unpack() {
+	xmms-plugin_src_unpack
+
+	cd ${S}/${PLUGIN_PATH}
+	cp ${S}/Output/OSS/soundcard.h .
+
+	sed -i 's:<Output/OSS/soundcard.h>:"soundcard.h":' *.{h,c}
+}
+
 src_compile() {
-	myconf="${myconf} --enable-cdaudio $(use_enable ipv6)"
+	myconf="${myconf} --enable-cdaudio $(use_enable ipv6) $(use_enable oss)"
 	xmms-plugin_src_compile
 }