Fixed missing oss header file when using installed sdk (xmms-1.2.10-r13 and later). Added IUSE="oss"

Package-Manager: portage-2.0.51-r15

4 files changed, 44 insertions, 13 deletions

diff --git a/media-plugins/xmms-esd/ChangeLog b/media-plugins/xmms-esd/ChangeLog
index 5fdda969a8b5..56257a9baa4d 100644
--- a/media-plugins/xmms-esd/ChangeLog
+++ b/media-plugins/xmms-esd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/xmms-esd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-esd/ChangeLog,v 1.1 2005/02/12 03:07:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-esd/ChangeLog,v 1.2 2005/02/12 07:43:59 eradicator Exp $
+
+  11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xmms-esd-1.2.10-r1.ebuild, xmms-esd-1.2.10.ebuild:
+  Fixed missing oss header file when using installed sdk (xmms-1.2.10-r13 and
+  later).  Added IUSE=oss
 
 *xmms-esd-1.2.10 (11 Feb 2005)
 
diff --git a/media-plugins/xmms-esd/Manifest b/media-plugins/xmms-esd/Manifest
index 149db641e23d..945faeacdbcf 100644
--- a/media-plugins/xmms-esd/Manifest
+++ b/media-plugins/xmms-esd/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
-MD5 ff204f9542dcc678c16be6a15d0ad3d8 xmms-esd-1.2.10.ebuild 469
-MD5 c07b430de975a0f00b0987f2bdf0fde4 xmms-esd-1.2.10-r1.ebuild 491
-MD5 a97c650f92ce6e35e9834f5f2a83cb6a ChangeLog 434
+MD5 17455c18402646a14f0ba31034351084 xmms-esd-1.2.10.ebuild 688
+MD5 c4eaa0a11df02575a18f3675dada9c60 ChangeLog 649
+MD5 b563fc25e1826f1c56c123191e81146c xmms-esd-1.2.10-r1.ebuild 710
 MD5 af2d409c36e9f3caee63715699f1ce44 files/digest-xmms-esd-1.2.10 142
 MD5 ee4c50bc643c29df08e03dffa42613b8 files/digest-xmms-esd-1.2.10-r1 227
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCDXMOArHZZzCEUG0RAkhCAJ90Kfctm/s2pOatsUUnOMGwbAuF1ACfVjfZ
-DZGcM+tTeMiyDNO5j8dxXo8=
-=TChT
+iD8DBQFCDbPJArHZZzCEUG0RAghWAJwJvMHaYNg2c5iiGPYm3TDaR4TeXwCfed6e
+UbvxRgH3VCdt1+5GfbqCu18=
+=H34O
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-esd/xmms-esd-1.2.10-r1.ebuild b/media-plugins/xmms-esd/xmms-esd-1.2.10-r1.ebuild
index 7132dd812eca..5f2af4f0a3d8 100644
--- a/media-plugins/xmms-esd/xmms-esd-1.2.10-r1.ebuild
+++ b/media-plugins/xmms-esd/xmms-esd-1.2.10-r1.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-esd/xmms-esd-1.2.10-r1.ebuild,v 1.1 2005/02/12 03:07:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-esd/xmms-esd-1.2.10-r1.ebuild,v 1.2 2005/02/12 07:43:59 eradicator Exp $
 
-IUSE=""
+IUSE="oss"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
@@ -15,5 +15,18 @@ PLUGIN_PATH="Output/esd"
 
 M4_VER="1.0"
 
-myconf="--enable-esd"
 inherit xmms-plugin
+
+src_unpack() {
+	xmms-plugin_src_unpack
+
+	cd ${S}/${PLUGIN_PATH}
+	cp ../OSS/soundcard.h .
+
+	sed -i 's:<Output/OSS/soundcard.h>:"soundcard.h":' *.{h,c}
+}
+
+src_compile() {
+	myconf="--enable-esd $(use_enable oss)"
+	xmms-plugin_src_compile
+}
diff --git a/media-plugins/xmms-esd/xmms-esd-1.2.10.ebuild b/media-plugins/xmms-esd/xmms-esd-1.2.10.ebuild
index 157c1708ae52..0670a0722023 100644
--- a/media-plugins/xmms-esd/xmms-esd-1.2.10.ebuild
+++ b/media-plugins/xmms-esd/xmms-esd-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-esd/xmms-esd-1.2.10.ebuild,v 1.1 2005/02/12 03:07:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-esd/xmms-esd-1.2.10.ebuild,v 1.2 2005/02/12 07:43:59 eradicator Exp $
 
-IUSE=""
+IUSE="oss"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
@@ -13,5 +13,18 @@ PLUGIN_PATH="Output/esd"
 
 M4_VER="1.0"
 
-myconf="--enable-esd"
 inherit xmms-plugin
+
+src_unpack() {
+	xmms-plugin_src_unpack
+
+	cd ${S}/${PLUGIN_PATH}
+	cp ../OSS/soundcard.h .
+
+	sed -i 's:<Output/OSS/soundcard.h>:"soundcard.h":' *.{h,c}
+}
+
+src_compile() {
+	myconf="--enable-esd $(use_enable oss)"
+	xmms-plugin_src_compile
+}