Resolving circular dependency between alsa-lib and jack. Bug #35674.

4 files changed, 55 insertions, 2 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 7f3c4dfcf8ed..228c9c2f5172 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2004/03/13 21:33:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.56 2004/03/15 00:19:18 eradicator Exp $
+
+*alsa-lib-1.0.3b-r1 (14 Mar 2004)
+
+  14 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.3b-r1.ebuild:
+  Resolving circular dependency between alsa-lib and jack.  Bug #35674.
 
 *alsa-lib-1.0.3b (13 Mar 2004)
 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index b3199e910221..2f0a4e213903 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -6,12 +6,14 @@ MD5 75df5b1b2764c1728a43db782123b38a alsa-lib-1.0.2.ebuild 1616
 MD5 aa121973afeb12465c8ca0e5771985f6 alsa-lib-0.9.7.ebuild 1104
 MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
 MD5 b0be58d32a8d9daf905608a8450dec78 alsa-lib-1.0.3b.ebuild 1536
-MD5 b52022ae189d8c0edc73d831b612153b ChangeLog 8032
+MD5 036c49a39c04eac5d63021235c99b4db ChangeLog 8226
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 9927b59da455a39a882c18891136e346 alsa-lib-1.0.1.ebuild 1800
+MD5 76500cdb32cd661c3963e50029d17704 alsa-lib-1.0.3b-r1.ebuild 1314
 MD5 477c697a35479bcb208db06f896e46cb alsa-lib-0.9.0_rc2.ebuild 1146
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 9070048b85478705fe11a7938a70c419 files/digest-alsa-lib-0.9.0_rc2 70
+MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b-r1 68
 MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
 MD5 b1d7f756d25d6a0b7270610b8730259d files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch 1788
 MD5 b1d7f756d25d6a0b7270610b8730259d files/alsa-lib-1.0.1-notextrel-notrampoline.patch 1788
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.3b-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.3b-r1.ebuild
new file mode 100644
index 000000000000..8d00a940e1ba
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.3b-r1.ebuild
@@ -0,0 +1,44 @@
+# 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.3b-r1.ebuild,v 1.1 2004/03/15 00:19:18 eradicator Exp $
+
+inherit libtool
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="jack"
+
+DEPEND=">=sys-devel/automake-1.7.2
+	>=sys-devel/autoconf-2.57-r1"
+
+PDEPEND="!ppc? ( jack? ( =media-plugins/alsa-jack-${PV}* ) )"
+
+MY_P=${P/_rc/rc}
+#SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MY_P}.tar.bz2"
+SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	elibtoolize
+	econf || die "./configure failed"
+	emake || die "make failed"
+}
+
+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.2 and a simple link
+	#fixes the problem (fingers crossed)
+	dosym /usr/lib/libasound.so.2 /usr/lib/libasound.so.1
+	dodoc ChangeLog COPYING TODO
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b-r1 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b-r1
new file mode 100644
index 000000000000..bb6690901875
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b-r1
@@ -0,0 +1 @@
+MD5 8ade68f0e9d44a039a741052985a8635 alsa-lib-1.0.3b.tar.bz2 570019