1.0.3 stable on x86. version bump.

16 files changed, 134 insertions, 15 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index d2e7ebfc5694..c559125eae02 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.60 2004/03/27 07:49:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.61 2004/04/04 19:01:18 eradicator Exp $
+
+*alsa-lib-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.3b-r1.ebuild, alsa-lib-1.0.3b-r2.ebuild,
+  alsa-lib-1.0.4.ebuild:
+  1.0.3 stable on x86.  Version bump.
 
   26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-lib-0.9.6.ebuild, alsa-lib-0.9.7.ebuild, alsa-lib-0.9.8.ebuild,
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d1aae1e8bd6b..8263d8f86358 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,6 +3,7 @@ MD5 88e7d7a1bdef247fc6b175e8ee840dd8 alsa-lib-0.5.10b.ebuild 698
 MD5 75df5b1b2764c1728a43db782123b38a alsa-lib-1.0.2.ebuild 1616
 MD5 835ef265e78730801f31d63657839026 alsa-lib-1.0.3b-r2.ebuild 1332
 MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
+MD5 835ef265e78730801f31d63657839026 alsa-lib-1.0.4.ebuild 1332
 MD5 d76d265119552942f5b2836cf4f807ee ChangeLog 8952
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 76500cdb32cd661c3963e50029d17704 alsa-lib-1.0.3b-r1.ebuild 1314
@@ -16,3 +17,4 @@ MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
 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 fb12c702eb134e6b86366ccf8aa6153d files/digest-alsa-lib-1.0.4 67
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild
index 417885ceb4da..4ceb54843c10 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.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.3b-r2.ebuild,v 1.1 2004/03/24 18:18:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild,v 1.2 2004/04/04 19:01:18 eradicator Exp $
 
 inherit libtool eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64"
+KEYWORDS="x86 ~ppc ~alpha ~amd64 -sparc ~ia64"
 LICENSE="GPL-2 LGPL-2.1"
 
 IUSE="jack"
@@ -26,6 +26,8 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
+
+	cd ${S}
 	elibtoolize
 
 	cd ${S}/src/pcm
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.3b-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild
index 8d00a940e1ba..dd08ff529206 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.3b-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.4.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.3b-r1.ebuild,v 1.1 2004/03/15 00:19:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.4.ebuild,v 1.1 2004/04/04 19:01:18 eradicator Exp $
 
 inherit libtool
 
@@ -24,10 +24,11 @@ SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
 	elibtoolize
-	econf || die "./configure failed"
-	emake || die "make failed"
 }
 
 src_install() {
@@ -37,7 +38,7 @@ src_install() {
 	#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
+	#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
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
deleted file mode 100644
index bb6690901875..000000000000
--- a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ade68f0e9d44a039a741052985a8635 alsa-lib-1.0.3b.tar.bz2 570019
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.4 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.4
new file mode 100644
index 000000000000..201d7837d2f8
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.4
@@ -0,0 +1 @@
+MD5 5f0967a9e71ffdfb47c41fed9e52d9a5 alsa-lib-1.0.4.tar.bz2 573089
diff --git a/media-plugins/alsa-jack/ChangeLog b/media-plugins/alsa-jack/ChangeLog
index 4e32fa03b3a2..59dbaade3aa9 100644
--- a/media-plugins/alsa-jack/ChangeLog
+++ b/media-plugins/alsa-jack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/alsa-jack
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/ChangeLog,v 1.4 2004/03/16 18:19:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/ChangeLog,v 1.5 2004/04/04 19:00:48 eradicator Exp $
+
+*alsa-jack-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-jack-1.0.3b.ebuild, alsa-jack-1.0.4.ebuild:
+  1.0.3 stable on x86.  Version bump.
 
   16 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-jack-1.0.3b.ebuild:
diff --git a/media-plugins/alsa-jack/Manifest b/media-plugins/alsa-jack/Manifest
index 76f142031ddf..01769dd440ef 100644
--- a/media-plugins/alsa-jack/Manifest
+++ b/media-plugins/alsa-jack/Manifest
@@ -1,4 +1,6 @@
 MD5 faeaeda3ed02c13d956676a20262d091 alsa-jack-1.0.3b.ebuild 859
+MD5 faeaeda3ed02c13d956676a20262d091 alsa-jack-1.0.4.ebuild 859
 MD5 361086a576c788ff43f8626dd8a8dfb4 ChangeLog 831
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 fb12c702eb134e6b86366ccf8aa6153d files/digest-alsa-jack-1.0.4 67
 MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-jack-1.0.3b 68
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.3b.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.3b.ebuild
index e48dc630064b..a13639d332ba 100644
--- a/media-plugins/alsa-jack/alsa-jack-1.0.3b.ebuild
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.3b.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-plugins/alsa-jack/alsa-jack-1.0.3b.ebuild,v 1.4 2004/03/16 18:19:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.3b.ebuild,v 1.5 2004/04/04 19:00:48 eradicator Exp $
 
 inherit libtool
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://alsaproject/lib/alsa-lib-${MY_PV}.tar.bz2"
 RESTRICT="nomirror"
 
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~ppc -sparc"
+KEYWORDS="x86 ~alpha ~amd64 ~ppc -sparc"
 LICENSE="GPL-2 LGPL-2.1"
 
 DEPEND="~media-libs/alsa-lib-${PV}
diff --git a/media-plugins/alsa-jack/alsa-jack-1.0.4.ebuild b/media-plugins/alsa-jack/alsa-jack-1.0.4.ebuild
new file mode 100644
index 000000000000..ed8ff66bc773
--- /dev/null
+++ b/media-plugins/alsa-jack/alsa-jack-1.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-jack/alsa-jack-1.0.4.ebuild,v 1.1 2004/04/04 19:00:48 eradicator Exp $
+
+inherit libtool
+
+MY_PV=${PV/_rc/rc}
+
+DESCRIPTION="JACK pcm plugin"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/alsa-lib-${MY_PV}.tar.bz2"
+RESTRICT="nomirror"
+
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~ppc -sparc"
+LICENSE="GPL-2 LGPL-2.1"
+
+DEPEND="~media-libs/alsa-lib-${PV}
+	virtual/jack"
+
+S=${WORKDIR}/alsa-lib-${MY_PV}
+
+src_compile() {
+	elibtoolize
+	econf --enable-jack || die "./configure failed"
+
+	cd ${S}/src/pcm/ext
+	make jack || die "make on jack plugin failed"
+}
+
+src_install() {
+		cd ${S}/src/pcm/ext
+		make DESTDIR=${D} install-jack || die "make install on jack plugin failed"
+}
diff --git a/media-plugins/alsa-jack/files/digest-alsa-jack-1.0.4 b/media-plugins/alsa-jack/files/digest-alsa-jack-1.0.4
new file mode 100644
index 000000000000..201d7837d2f8
--- /dev/null
+++ b/media-plugins/alsa-jack/files/digest-alsa-jack-1.0.4
@@ -0,0 +1 @@
+MD5 5f0967a9e71ffdfb47c41fed9e52d9a5 alsa-lib-1.0.4.tar.bz2 573089
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index b6a5ec492014..58764f5f761f 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.49 2004/03/31 03:10:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.50 2004/04/04 18:59:18 eradicator Exp $
+
+*alsa-utils-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.3.ebuild, alsa-utils-1.0.4.ebuild:
+  1.0.3 stable on x86.  version bump.
 
   30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-utils-0.9.5.ebuild, alsa-utils-1.0.0_rc2.ebuild,
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 9590a03de924..a3fa44d702e4 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,4 +1,5 @@
 MD5 8213cd5df50ead11fe4b21add33cedcb alsa-utils-0.9.2.ebuild 909
+MD5 6776d52a2b0f7b09c13fee127b73a6a4 alsa-utils-1.0.4.ebuild 1720
 MD5 228feb68f019961e1248c98183dec466 alsa-utils-0.9.0_rc2.ebuild 923
 MD5 6776d52a2b0f7b09c13fee127b73a6a4 alsa-utils-1.0.3.ebuild 1720
 MD5 ff781e61df4fc5f2434eac0feb4b90fb alsa-utils-0.9.8.ebuild 1777
@@ -12,6 +13,7 @@ MD5 55414f65ffecf5f44fa35295dae8bf19 files/digest-alsa-utils-0.9.2 69
 MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69
 MD5 937332cbdb9fab58e9e43a58a3f965de files/digest-alsa-utils-1.0.2 69
 MD5 fb1ac340c0b5d2f19099ee4c89100919 files/digest-alsa-utils-1.0.3 69
+MD5 2f5a9c2a8b65900d3e06596e994c58db files/digest-alsa-utils-1.0.4 69
 MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626
 MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392
 MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.3.ebuild
index c8fa8aacb942..e302242f0ac4 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.3.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.3.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-sound/alsa-utils/alsa-utils-1.0.3.ebuild,v 1.3 2004/03/31 03:10:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.3.ebuild,v 1.4 2004/04/04 18:59:18 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -9,7 +9,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 
 SLOT="0.9"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 MY_P=${P/_rc/rc}
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild
new file mode 100644
index 000000000000..c9a9dc2c9c1d
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild,v 1.1 2004/04/04 18:59:18 eradicator Exp $
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+DEPEND=">=sys-libs/ncurses-5.1
+	>=media-libs/alsa-lib-1.0.3"
+
+SLOT="0.9"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+MY_P=${P/_rc/rc}
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+IUSE=""
+
+src_install() {
+	local ALSA_UTILS_DOCS="COPYING ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	make DESTDIR=${D} install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	dodir /etc/init.d
+	insinto /etc/modules.d
+	newins ${FILESDIR}/alsa-modules.conf-rc alsa
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/alsasound
+}
+
+pkg_postinst() {
+	echo
+	einfo "The alsasound initscript is now provided by alsa-utils"
+	einfo "instead of alsa-driver for compatibility with kernel-sources"
+	einfo "which provide ALSA internally."
+	echo
+	einfo "To take advantage of this, and automate the process of"
+	einfo "loading and unloading the ALSA sound drivers as well as"
+	einfo "storing and restoring sound-card mixer levels you should"
+	einfo "add alsasound to the boot runlevel. You can do this as"
+	einfo "root like so:"
+	einfo "	# rc-update add alsasound boot"
+	echo
+	einfo "You will also need to edit the file /etc/modules.d/alsa"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
+	echo
+}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.4 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.4
new file mode 100644
index 000000000000..c9bf3083df57
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.4
@@ -0,0 +1 @@
+MD5 26de6ddd3b6ff44b79b163c16642f375 alsa-utils-1.0.4.tar.bz2 142685