Version bumped.

9 files changed, 107 insertions, 9 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 6c5919b40dea..eabcd9f682aa 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.48 2004/01/18 07:10:51 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.49 2004/01/27 18:49:50 mholzer Exp $
+
+*alsa-lib-1.0.2 (27 Jan 2004)
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-lib-1.0.1.ebuild,
+  alsa-lib-1.0.2.ebuild:
+  Version bumped.
 
   18 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> alsa-lib-0.9.8.ebuild:
   set ppc in keywords
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index ad51e55460dd..a4250b51f5cf 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,12 +1,12 @@
-MD5 5b80be38a5458929242d6fe5b37ef98c ChangeLog 7212
+MD5 f3a626efcadaa9f5e3348b22d7b810af ChangeLog 7356
 MD5 88e7d7a1bdef247fc6b175e8ee840dd8 alsa-lib-0.5.10b.ebuild 698
 MD5 477c697a35479bcb208db06f896e46cb alsa-lib-0.9.0_rc2.ebuild 1146
 MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
 MD5 e024e9ec933cfceabcc144e8f7272d6f alsa-lib-0.9.6.ebuild 1104
 MD5 aa121973afeb12465c8ca0e5771985f6 alsa-lib-0.9.7.ebuild 1104
 MD5 2140d5b0f028204a2ed2e24b0fe230d3 alsa-lib-0.9.8.ebuild 1585
-MD5 b48d120f602c4654d0a63ced4419920c alsa-lib-1.0.1.ebuild 1800
-MD5 b48d120f602c4654d0a63ced4419920c alsa-lib-1.0.2.ebuild 1800
+MD5 03ce9b038b8e622e2f7c46f871ccd7a9 alsa-lib-1.0.1.ebuild 1793
+MD5 91ac96fa6a38ee5ec353fbec931c7889 alsa-lib-1.0.2.ebuild 1526
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 81de5d6acaaabfba855da4ff2bedacd0 alsa-lib-1.0.0_rc2-r1.ebuild 1806
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild
index 614ac324036d..eb08f032715d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.1.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.1.ebuild,v 1.1 2004/01/10 13:29:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild,v 1.2 2004/01/27 18:49:50 mholzer Exp $
 
 inherit libtool
 
@@ -31,7 +31,7 @@ src_unpack() {
 	# - remove trampolines and text relocations - <solar@gentoo>
 	## send this patch upstream after we have tested fully 
 	## on the various arches for inclusion in 1.x final
-	epatch ${FILESDIR}/${PN}-${PV}-notextrel-notrampoline.patch
+	epatch ${FILESDIR}/${P}-notextrel-notrampoline.patch
 }
 
 src_compile() {
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild
new file mode 100644
index 000000000000..6949ebc0d7fe
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.2.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2004/01/27 18:49:50 mholzer Exp $
+
+inherit libtool
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="jack"
+
+DEPEND="virtual/glibc
+	>=sys-devel/automake-1.7.2
+	>=sys-devel/autoconf-2.57-r1
+	!ppc? ( jack? ( virtual/jack ) )"
+
+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"
+
+	if [ -n "`use jack`" ]
+	then
+		cd ${S}/src/pcm/ext
+		make jack || die "make on jack plugin failed"
+	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.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
+
+	if [ -n "`use jack`" ]
+	then
+		cd ${S}/src/pcm/ext
+		make DESTDIR=${D} install-jack || die "make install on jack plugin failed"
+	fi
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.2 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.2
new file mode 100644
index 000000000000..8002c365db20
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.2
@@ -0,0 +1 @@
+MD5 958baec6653a6877b17870d7b80c1d89 alsa-lib-1.0.2.tar.bz2 563797
diff --git a/media-libs/alsa-oss/ChangeLog b/media-libs/alsa-oss/ChangeLog
index 629934b04956..289596590703 100644
--- a/media-libs/alsa-oss/ChangeLog
+++ b/media-libs/alsa-oss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-oss
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.23 2004/01/17 03:22:12 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.24 2004/01/27 18:50:14 mholzer Exp $
+
+*alsa-oss-1.0.2 (27 Jan 2004)
+
+  27 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-oss-1.0.2.ebuild:
+  Version bumped.
 
   17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> alsa-oss-0.9.8.ebuild:
   manifest fix
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 41dbad435f97..134ff98e9131 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,11 +1,11 @@
-MD5 f1f20fb019e3262acf3dad4bb9320202 ChangeLog 2664
+MD5 dbbfdbb8968f91da97ccd7cf5d5dc258 ChangeLog 2783
 MD5 46f67ccd2ada34311aab26406d0544b2 alsa-oss-0.9.0_rc1.ebuild 717
 MD5 d7f11ca1d57fffbcb384540bb8f75fcf alsa-oss-0.9.0_rc8.ebuild 689
 MD5 dc32f8e4fa3fbc608ff7e8b9d2763e23 alsa-oss-0.9.1.ebuild 674
 MD5 a135826ed09b0df67c03fff507a73723 alsa-oss-0.9.4.ebuild 675
 MD5 55e20832862224014a877a6dd56cd71c alsa-oss-0.9.6.ebuild 675
 MD5 5f6955d62e7c408c7740f6d882e8f4ac alsa-oss-0.9.8.ebuild 695
-MD5 d1e3fd98428c54aea05689eafe343c86 alsa-oss-1.0.2.ebuild 780
+MD5 46d476d8b4686c34714f61e8061ace86 alsa-oss-1.0.2.ebuild 780
 MD5 4a1f4305a6bddb4b70f2502c692127ed alsa-oss-1.0.0_rc2.ebuild 787
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 ace510f5ccde1bcd4777bfe5cbf85a20 alsa-oss-1.0.1.ebuild 780
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.2.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.2.ebuild
new file mode 100644
index 000000000000..f22c18cb3458
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.2.ebuild
@@ -0,0 +1,29 @@
+# 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-oss/alsa-oss-1.0.2.ebuild,v 1.1 2004/01/27 18:50:14 mholzer Exp $
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer."
+HOMEPAGE="http://www.alsa-project.org/"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=media-libs/alsa-lib-1.0.2"
+
+SLOT="0"
+KEYWORDS="~x86 -sparc ~ppc ~amd64"
+
+MY_P=${P/_rc/rc}
+SRC_URI="mirror://alsaproject/oss-lib/${P}.tar.bz2"
+#SRC_URI="ftp://ftp.alsa-project.org/pub/oss-lib/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf || die "./configure failed"
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	einstall || die
+	dodoc COPYING
+}
diff --git a/media-libs/alsa-oss/files/digest-alsa-oss-1.0.2 b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.2
new file mode 100644
index 000000000000..1b7089240c6a
--- /dev/null
+++ b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.2
@@ -0,0 +1 @@
+MD5 464b4840c6416875171113f233d896e4 alsa-oss-1.0.2.tar.bz2 142906