Stop caring about the alsa-lib-0.5 crap. Always build shared and static. This was a misuse of the static USE flag.

Package-Manager: portage-2.0.51-r15

3 files changed, 22 insertions, 11 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 74d189747c9d..3b772ac4c058 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.100 2005/01/25 20:05:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.101 2005/02/03 21:37:29 eradicator Exp $
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.8.ebuild:
+  Stop caring about the alsa-lib-0.5 crap. Always build shared and static.
+  This was a misuse of the static USE flag.
 
   25 Jan 2005; Markus Rothe <corsair@gentoo.org> alsa-lib-1.0.7.ebuild:
   Stable on ppc64
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 8c914dfc586c..869a240a51ca 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,13 +1,16 @@
-MD5 f7bf71a5b73e13eb929307eecebe6b82 ChangeLog 14911
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d110f8ca9c5ebc09bc49713d05fd0aad ChangeLog 15116
 MD5 5659184e067dbf68af9e9251837332c5 alsa-lib-0.9.8.ebuild 1584
 MD5 c840b6d57683f228d3db41a4091e78a5 alsa-lib-1.0.2.ebuild 1609
 MD5 6f25a91cdae08f1cd6cd2cb121506a49 alsa-lib-1.0.5-r3.ebuild 1766
 MD5 6357a1ba435460e8bd79caaa887cf2e5 alsa-lib-1.0.5.ebuild 1734
 MD5 ac0499313adb253d4e050427ffa2ee88 alsa-lib-1.0.6.ebuild 1911
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 f76db95757c8e6fac22dd074d1da8b92 alsa-lib-1.0.7.ebuild 2056
 MD5 9f71fd6d9092e8ef70ba72cde7b94670 alsa-lib-1.0.8_rc1.ebuild 1607
-MD5 ea06b6944347487b7dc70073a13106ce alsa-lib-1.0.8.ebuild 1609
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 68048a156e2ed22811b9d8ee81ab58bf alsa-lib-1.0.8.ebuild 1488
 MD5 ff6b3f2ba9f419d2e31c55f93da0e170 files/alsa-lib-1.0.7-pcm_wait.patch 342
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
@@ -18,3 +21,10 @@ MD5 5d0f60405a57450fdd98ceb5d4398056 files/digest-alsa-lib-1.0.6 67
 MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
 MD5 8ba7bd0bfd177d142b304ad90dc8b75b files/digest-alsa-lib-1.0.8_rc1 70
 MD5 46a389b403bc763310e942cc9fc6d7b1 files/digest-alsa-lib-1.0.8 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCApq6ArHZZzCEUG0RAlKyAJ9Qmu0h4Tsd5d8z2weuPbDy0Ia3xwCfWW6Z
+S5NNsuEIZ3wj8vd9H76KeXk=
+=MOpT
+-----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
index 5961e909949e..f35ceebe2d14 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.8.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-libs/alsa-lib/alsa-lib-1.0.8.ebuild,v 1.1 2005/01/23 07:02:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.8.ebuild,v 1.2 2005/02/03 21:37:29 eradicator Exp $
 
-IUSE="static jack doc"
+IUSE="jack doc"
 
 inherit eutils
 
@@ -31,7 +31,7 @@ src_compile() {
 	# needed to avoid gcc looping internaly
 	use hppa && export CFLAGS="-O1 -pipe"
 
-	econf $(use_enable static) --enable-shared=yes || die
+	econf --enable-static=yes --enable-shared=yes || die
 	emake || die
 
 	if use doc; then
@@ -42,15 +42,11 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	preserve_old_lib /usr/$(get_libdir)/libasound.so.1
-
 	dodoc ChangeLog COPYING TODO
 	use doc && dohtml -r doc/doxygen/html/*
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libasound.so.1
-
 	einfo "If you are using an emu10k1 based sound card, and you are upgrading"
 	einfo "from a version of alsalib <1.0.6, you will need to recompile packages"
 	einfo "that link against alsa-lib due to some ABI changes between 1.0.5 and"