USE=static option for bug #48233.

3 files changed, 27 insertions, 11 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index c40eca139370..0ac46a6ac009 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.63 2004/04/17 08:14:44 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.64 2004/04/20 08:12:01 eradicator Exp $
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.4.ebuild:
+  USE=static option for bug #48233.
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> alsa-lib-1.0.3b-r2.ebuild:
   stable on amd64
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index bb9ad4bd291a..78e55da8ecc1 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,18 +1,18 @@
-MD5 d28cd8ddece3823cb298dda62588fdb1 ChangeLog 9377
-MD5 88e7d7a1bdef247fc6b175e8ee840dd8 alsa-lib-0.5.10b.ebuild 698
-MD5 477c697a35479bcb208db06f896e46cb alsa-lib-0.9.0_rc2.ebuild 1146
-MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
 MD5 a82dc4555d67cacdfbd8da8a1ea448a3 alsa-lib-0.9.8.ebuild 1579
+MD5 88e7d7a1bdef247fc6b175e8ee840dd8 alsa-lib-0.5.10b.ebuild 698
 MD5 7ebe47229d1806ff2417f33759e23250 alsa-lib-1.0.2.ebuild 1625
 MD5 2d72593f7a848ae6e6ce36bfd4a0bd10 alsa-lib-1.0.3b-r2.ebuild 1332
-MD5 9da389d1a8faf2afc6d36bcc502efecf alsa-lib-1.0.4.ebuild 1269
+MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
+MD5 b8ff3261450f5a6b838319f6e7e673ef alsa-lib-1.0.4.ebuild 1484
+MD5 b7d56137d8616ee97a838a0cae66695d ChangeLog 9504
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
+MD5 477c697a35479bcb208db06f896e46cb alsa-lib-0.9.0_rc2.ebuild 1146
 MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
-MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
 MD5 9070048b85478705fe11a7938a70c419 files/digest-alsa-lib-0.9.0_rc2 70
+MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b-r2 68
+MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
 MD5 3a81898f3853065f59af943b3e1f4df2 files/digest-alsa-lib-0.9.2 67
 MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 ebf9199686eb993db91c807d7fd90dcb files/digest-alsa-lib-1.0.2 67
-MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b-r2 68
 MD5 fb12c702eb134e6b86366ccf8aa6153d files/digest-alsa-lib-1.0.4 67
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild
index dd08ff529206..2d9262ad9703 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild,v 1.1 2004/04/04 19:01:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild,v 1.2 2004/04/20 08:12:01 eradicator Exp $
 
 inherit libtool
 
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64"
 LICENSE="GPL-2 LGPL-2.1"
 
-IUSE="jack"
+IUSE="jack static"
 
 DEPEND=">=sys-devel/automake-1.7.2
 	>=sys-devel/autoconf-2.57-r1"
@@ -31,8 +31,20 @@ src_unpack() {
 	elibtoolize
 }
 
+src_compile() {
+	local myconf=""
+
+	# Can't do both according to alsa docs and bug #48233
+	if use static; then
+		myconf="--enable-static=yes --enable-shared=no"
+	fi
+
+	econf ${myconf} || die
+	emake || die
+}
+
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	#This alsa version does not provide libasound.so.1
 	#Without this library just about everything even remotely