Add symlink to alsa driver headers if alsa-drivers is not installed. This should take care of problems like bug #54381.

6 files changed, 119 insertions, 13 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 3123316232e5..ac75f39aa7ac 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,17 @@
 # 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.67 2004/06/07 23:54:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.68 2004/06/19 11:15:16 eradicator Exp $
+
+*alsa-lib-1.0.5-r1 (19 Jun 2004)
+
+  19 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-lib-1.0.5-r1.ebuild:
+  Add symlink to alsa driver headers if alsa-drivers is not installed. This
+  should take care of problems like bug #54381.
+
+  13 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-0.9.8.ebuild, alsa-lib-1.0.2.ebuild:
+  Getting rid of virtual/jack.
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> alsa-lib-1.0.2.ebuild:
   Fix use invocation
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index cfa74854db56..33f6ae0d37d4 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,20 +1,22 @@
-MD5 262a521cccf2ab6a64d871bbc58ae913 alsa-lib-0.9.8.ebuild 1578
+MD5 f611a7547b2db08af8e49b675f105f1c ChangeLog 10001
 MD5 c94e62ed673987f8e9ba856fbda4b98e alsa-lib-0.5.10b.ebuild 697
-MD5 6a4d47f1ceb5a0050f2b5e9cca6da2b9 alsa-lib-1.0.5.ebuild 1721
-MD5 d956fef182406417ecca98446ee9ef40 alsa-lib-1.0.2.ebuild 1604
-MD5 700af85f30f0c17f06bdc403d17829da alsa-lib-1.0.3b-r2.ebuild 1331
+MD5 1341163665879c16f63c93b0e59d2991 alsa-lib-0.9.0_rc2.ebuild 1145
 MD5 aaf25958b7d722a8bbee5834df9f3422 alsa-lib-0.9.2.ebuild 1118
+MD5 8474f062e3d544e253084c78abae5680 alsa-lib-0.9.8.ebuild 1603
+MD5 ad4ad7a98f7b9e45f82472e8269e9508 alsa-lib-1.0.2.ebuild 1629
+MD5 700af85f30f0c17f06bdc403d17829da alsa-lib-1.0.3b-r2.ebuild 1331
 MD5 8c4b8c479a21f0b6429a016150789a23 alsa-lib-1.0.4.ebuild 1721
-MD5 84f0f4b636c993390bb940beb61f511e ChangeLog 9864
+MD5 6a4d47f1ceb5a0050f2b5e9cca6da2b9 alsa-lib-1.0.5.ebuild 1721
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
-MD5 1341163665879c16f63c93b0e59d2991 alsa-lib-0.9.0_rc2.ebuild 1145
+MD5 ecda8b777a49ff526b5ce1cca3345660 alsa-lib-1.0.5-r1.ebuild 2608
 MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 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-r2 68
 MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
+MD5 9070048b85478705fe11a7938a70c419 files/digest-alsa-lib-0.9.0_rc2 70
 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
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5 67
+MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r1 67
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild
index 9aa4d6c06c7b..07fbb360a31e 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.8.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-0.9.8.ebuild,v 1.11 2004/03/27 07:48:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild,v 1.12 2004/06/19 11:15:16 eradicator Exp $
 
 inherit libtool
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2 LGPL-2.1"
 
 IUSE="jack"
 
-RDEPEND="!ppc? ( jack? ( virtual/jack ) )"
+RDEPEND="!ppc? ( jack? ( media-sound/jack-audio-connection-kit ) )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.7.2
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild
index e789f30f3923..e92498bcdd70 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.2.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.2.ebuild,v 1.6 2004/06/07 23:54:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild,v 1.7 2004/06/19 11:15:16 eradicator Exp $
 
 inherit libtool gnuconfig
 
@@ -16,7 +16,7 @@ IUSE="jack"
 DEPEND="virtual/glibc
 	>=sys-devel/automake-1.7.2
 	>=sys-devel/autoconf-2.57-r1
-	!ppc? ( jack? ( virtual/jack ) )"
+	!ppc? ( jack? ( media-sound/jack-audio-connection-kit ) )"
 
 MY_P=${P/_rc/rc}
 #SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MY_P}.tar.bz2"
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.5-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..bebc7db00494
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.5-r1.ebuild
@@ -0,0 +1,92 @@
+# 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.5-r1.ebuild,v 1.1 2004/06/19 11:15:16 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 static"
+
+RDEPEND="virtual/alsa"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7.2"
+
+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"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	if use static; then
+		mv ${S} ${S}.static
+		unpack ${A}
+
+		cd ${S}.static
+		elibtoolize
+	fi
+
+	cd ${S}
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=""
+
+	econf --enable-static=no --enable-shared=yes || die
+	emake || die
+
+	# Can't do both according to alsa docs and bug #48233
+	if use static; then
+		cd ${S}.static
+		econf --enable-static=yes --enable-shared=no || die
+		emake || die
+	fi
+}
+
+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
+	dodoc ChangeLog COPYING TODO
+
+	if use static; then
+		cd ${S}.static
+		make DESTDIR="${D}" install || die "make install failed"
+	fi
+}
+
+pkg_postinst() {
+	# This is kinda hackish, so if someone else has a better idea,
+	# feel free to implement it.  We need to detect if /usr/include/sound
+	# exists.  If it does, then we leave it alone.  If it doesn't, we
+	# assume virtual/alsa was satisfied by 2.6 sources and setup a symlink.
+	# If they emerge alsa-driver, then the real dir with overwrite the symlink.
+
+	if ! [ -e /usr/include/sound ]; then
+		if [ -d /usr/src/linux/include/sound ]; then
+			ln -s /usr/src/linux/include/sound /usr/include/sound
+		else
+			eerror "You don't seem to have valid alsa (driver) headers installed at /usr/include/sound."
+			eerror "and I couldn't find any at /usr/src/linux/include/sound to use either.  Please"
+			eerror "emerge alsa-driver or setup /usr/src/linux to point to a valid 2.6.x kernel"
+			eerror "then run ln -s /usr/src/linux/include/sound /usr/include/sound"
+		fi
+	fi
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r1 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r1
new file mode 100644
index 000000000000..358b269dffe0
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r1
@@ -0,0 +1 @@
+MD5 fc9d701a8a26c09db0aaf3faef13eeb0 alsa-lib-1.0.5.tar.bz2 576678