get_libdir fixes, and no longer symlinking to old libasound lib.

3 files changed, 19 insertions, 16 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 2e0af04f24db..3593aa2f40ba 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.87 2004/10/03 00:19:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.88 2004/10/07 02:40:22 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.6.ebuild:
+  get_libdir fixes, and no longer symlinking to old libasound lib.
 
   02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   -alsa-lib-0.5.10b.ebuild, -alsa-lib-0.9.0_rc2.ebuild,
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index c05f0c46d888..b49d8f4b7505 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,10 +3,10 @@ Hash: SHA1
 
 MD5 822d0bc40f450fe449fd3696fc9f7929 alsa-lib-0.9.8.ebuild 1593
 MD5 c471e059fe873817a2730b9577a2fd97 alsa-lib-1.0.2.ebuild 1619
-MD5 b67ba9930f7f98d2336d972727f20f26 alsa-lib-1.0.6.ebuild 1766
+MD5 0bee297c96c58eef5f670bb8da1099a5 alsa-lib-1.0.6.ebuild 1550
 MD5 c973b30d8ab60d83b053649c0fca42bb alsa-lib-1.0.5.ebuild 1743
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 9081591e20c0f5e5074a8ed9ef10ac9a ChangeLog 13041
+MD5 2c97f36307326bb4db076adb853faecf ChangeLog 13191
 MD5 819916b5aecdc585b5add5d587bc8342 alsa-lib-1.0.5-r3.ebuild 1762
 MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
@@ -18,7 +18,7 @@ MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r3 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBX0WBArHZZzCEUG0RAjWGAJwKI52dRkL522uT+w9Xr1rxfemZMgCeOurb
-v2IeQJCnFMULquioOlBc7Gc=
-=yHtU
+iD8DBQFBZKyhArHZZzCEUG0RAqqTAJ9eHAJ8qb+b701dLxWVwvIQ9JeT3wCcD8gQ
+Zb3JLTI8Z3X/oOOhMaZkWQo=
+=Ybqw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
index b7152c6d2e70..f581ee756267 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 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.6.ebuild,v 1.3 2004/09/28 04:25:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild,v 1.4 2004/10/07 02:40:22 eradicator Exp $
 
 IUSE="static jack"
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64 ~ppc64 ~hppa"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64 ~ppc64 ~hppa ~mips"
 LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND="virtual/alsa
@@ -57,13 +57,8 @@ src_compile() {
 src_install() {
 	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
-	#linked to previous versions of alsa-lib will break.
-	#Fortunately, libasound.so.2 seems to be backwards
-	#compatible with libasound.so.1 and a simple link
-	#fixes the problem (fingers crossed)
-	dosym /usr/lib/libasound.so.2 /usr/lib/libasound.so.1
+	preserve_old_lib /usr/$(get_libdir)/libasound.so.1
+
 	dodoc ChangeLog COPYING TODO
 
 	if use static; then
@@ -71,3 +66,7 @@ src_install() {
 		make DESTDIR="${D}" install || die "make install failed"
 	fi
 }
+
+src_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libasound.so.1
+}