Version bump.

8 files changed, 120 insertions, 4 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index c0b8ed9a813e..8f6126507eda 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.83 2004/08/17 23:25:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.84 2004/08/23 21:56:08 eradicator Exp $
+
+*alsa-lib-1.0.6 (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-lib-1.0.6.ebuild:
+  Version bump.
 
   17 Aug 2004; Guy Martin <gmsoft@gentoo.org> alsa-lib-1.0.5-r3.ebuild:
   Forced CFLAGS=-O1 on hppa. Marked stable.
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index baeb366defe9..2123433603fa 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,12 @@
-MD5 9b3706a208c1d4fc7f5597bbcfbcd0f5 ChangeLog 12505
 MD5 bf801d07f50219e7fdd6339b04dfdfc7 alsa-lib-0.5.10b.ebuild 680
 MD5 7c90372c7182d18451b440d539765eee alsa-lib-0.9.0_rc2.ebuild 1148
 MD5 2cc91be92115ec1127cbb3db31985420 alsa-lib-0.9.2.ebuild 1103
 MD5 822d0bc40f450fe449fd3696fc9f7929 alsa-lib-0.9.8.ebuild 1593
 MD5 c471e059fe873817a2730b9577a2fd97 alsa-lib-1.0.2.ebuild 1619
+MD5 d6edb73fbe117da023b83d7ca971c20a alsa-lib-1.0.6.ebuild 1765
 MD5 c973b30d8ab60d83b053649c0fca42bb alsa-lib-1.0.5.ebuild 1743
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 9b3706a208c1d4fc7f5597bbcfbcd0f5 ChangeLog 12505
 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
@@ -14,5 +15,6 @@ 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 5d0f60405a57450fdd98ceb5d4398056 files/digest-alsa-lib-1.0.6 67
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5 67
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r3 67
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
new file mode 100644
index 000000000000..cd3b88cd6090
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
@@ -0,0 +1,73 @@
+# 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.1 2004/08/23 21:56:08 eradicator Exp $
+
+IUSE="static jack"
+
+inherit libtool
+
+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"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND="virtual/alsa
+	 >=media-sound/alsa-headers-1.0.5a"
+
+DEPEND=">=sys-devel/automake-1.7.2
+	>=sys-devel/autoconf-2.57-r1"
+
+PDEPEND="!ppc? ( jack? ( =media-plugins/alsa-jack-${PV}* ) )"
+
+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=""
+
+	# needed to avoid gcc looping internaly
+	use hppa && export CFLAGS="-O1 -pipe"
+
+	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
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.6 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.6
new file mode 100644
index 000000000000..10bf81c06236
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.6
@@ -0,0 +1 @@
+MD5 d1534d9d2301f247b54a9e8cff4183c5 alsa-lib-1.0.6.tar.bz2 675254
diff --git a/media-libs/alsa-oss/ChangeLog b/media-libs/alsa-oss/ChangeLog
index 33083066625f..8808d4413c04 100644
--- a/media-libs/alsa-oss/ChangeLog
+++ b/media-libs/alsa-oss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/alsa-oss
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.38 2004/08/17 19:27:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.39 2004/08/23 21:57:46 eradicator Exp $
+
+*alsa-oss-1.0.6 (23 Aug 2004)
+
+  23 Aug 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-oss-1.0.6.ebuild:
+  Version bump.
 
   17 Aug 2004; Aron Griffis <agriffis@gentoo.org> alsa-oss-1.0.5.ebuild:
   add ~alpha #60071
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 2b2db8d4ff9d..514d8cfd9162 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,8 +1,10 @@
-MD5 39c8474f87a0e76cb9fd716bf36fc662 ChangeLog 4697
 MD5 d750bd963efb6cc95817b35182c29aee alsa-oss-0.9.0_rc1.ebuild 720
 MD5 04514da14b1bfbc528f94ced9f66a9f2 alsa-oss-0.9.8.ebuild 675
+MD5 c289a98f5a6b9fa9778117551578b617 alsa-oss-1.0.6.ebuild 628
 MD5 9221fd3a0b43ce688021eed0c71b966c alsa-oss-1.0.5.ebuild 625
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 39c8474f87a0e76cb9fd716bf36fc662 ChangeLog 4697
 MD5 1c1bc7c43df4fe44b944871d8cc78c65 files/digest-alsa-oss-0.9.0_rc1 69
 MD5 539c12102445bed353dfb3d03effab44 files/digest-alsa-oss-0.9.8 67
+MD5 5523e7c468a5a4efadfbb60659bb5989 files/digest-alsa-oss-1.0.6 67
 MD5 00774b4fe07ec2e40f9c5e9ad999400f files/digest-alsa-oss-1.0.5 67
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.6.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.6.ebuild
new file mode 100644
index 000000000000..8958f047f35d
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-1.0.6.ebuild,v 1.1 2004/08/23 21:57:46 eradicator Exp $
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer."
+HOMEPAGE="http://www.alsa-project.org/"
+LICENSE="GPL-2"
+
+DEPEND="virtual/libc
+	>=media-libs/alsa-lib-1.0"
+
+SLOT="0"
+KEYWORDS="~x86 -sparc ~ppc ~amd64 ~alpha"
+
+IUSE=""
+
+MY_P=${P/_rc/rc}
+SRC_URI="mirror://alsaproject/oss-lib/${P}.tar.bz2"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	einstall || die
+	dodoc COPYING
+}
diff --git a/media-libs/alsa-oss/files/digest-alsa-oss-1.0.6 b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.6
new file mode 100644
index 000000000000..0b22fc08f030
--- /dev/null
+++ b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.6
@@ -0,0 +1 @@
+MD5 b104ba44268718cacf36fa18383162fe alsa-oss-1.0.6.tar.bz2 223104