Added sleeps to get around a bug in udev. See bug #39345. Removing old ebuilds and cleaning up existing.

10 files changed, 17 insertions, 169 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index be75ac392646..b6a5ec492014 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.48 2004/03/14 00:28:35 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.49 2004/03/31 03:10:03 eradicator Exp $
+
+  30 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-0.9.5.ebuild, alsa-utils-1.0.0_rc2.ebuild,
+  alsa-utils-1.0.1.ebuild, alsa-utils-1.0.2.ebuild, alsa-utils-1.0.3.ebuild,
+  files/alsasound:
+  Added sleeps to get around a bug in udev.  See bug #39345.
+  Removing old ebuilds and cleaning up existing.
 
   13 Mar 2004; Stephen P. Becker <geoman@gentoo.org> alsa-utils-1.0.2.ebuild:
   Added ~mips keyword.
diff --git a/media-sound/alsa-utils/alsa-utils-0.9.5.ebuild b/media-sound/alsa-utils/alsa-utils-0.9.5.ebuild
deleted file mode 100644
index b8684d490207..000000000000
--- a/media-sound/alsa-utils/alsa-utils-0.9.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-0.9.5.ebuild,v 1.4 2004/03/01 05:37:12 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-0.9.5"
-
-SLOT="0.9"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-S=${WORKDIR}/${P}
-
-src_compile() {
-
-	econf || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
-
-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
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.0_rc2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.0_rc2.ebuild
deleted file mode 100644
index 4b0b654a9f82..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.0_rc2.ebuild,v 1.5 2004/03/10 02:45:14 tgall 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.0_rc2"
-
-SLOT="0.9"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-MY_P=${P/_rc/rc}
-SRC_URI="ftp://ftp.alsa-project.org/pub/utils/${MY_P}.tar.bz2"
-#SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-#RESTRICT="nomirror"
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-
-	econf || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
-
-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/alsa-utils-1.0.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.1.ebuild
deleted file mode 100644
index a88291b00618..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.1.ebuild,v 1.4 2004/03/10 02:45:14 tgall 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.0_rc2"
-
-SLOT="0.9"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/utils/${MY_P}.tar.bz2"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-RESTRICT="nomirror"
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-
-	econf || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
-
-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/alsa-utils-1.0.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild
index bc165b8d4503..843bd7c00b2c 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-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-sound/alsa-utils/alsa-utils-1.0.2.ebuild,v 1.5 2004/03/14 00:28:35 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild,v 1.6 2004/03/31 03:10:03 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -12,15 +12,11 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64 ~mips"
 
 MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/utils/${MY_P}.tar.bz2"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 RESTRICT="nomirror"
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	econf || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
+IUSE=""
 
 src_install() {
 	local ALSA_UTILS_DOCS="COPYING ChangeLog README TODO
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 b956ea5af473..c8fa8aacb942 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.2 2004/03/10 02:45:14 tgall Exp $
+# $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 $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -12,15 +12,11 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
 
 MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/utils/${MY_P}.tar.bz2"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 RESTRICT="nomirror"
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	econf || die "./configure failed"
-	emake || die "Parallel Make Failed"
-}
+IUSE=""
 
 src_install() {
 	local ALSA_UTILS_DOCS="COPYING ChangeLog README TODO
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index 8941edd65238..5bdb1d8875ac 100644
--- a/media-sound/alsa-utils/files/alsasound
+++ b/media-sound/alsa-utils/files/alsasound
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.11 2004/02/21 00:12:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.12 2004/03/31 03:10:07 eradicator Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -115,6 +115,10 @@ start() {
 		CARDS="$(cat /proc/asound/cards | awk '/: / { print $1 }')"
 		for CARDNUM in ${CARDS}
 		do
+			[ -e /dev/snd/controlC0 ] || sleep 2
+			[ -e /dev/snd/controlC0 ] || sleep 2
+			[ -e /dev/snd/controlC0 ] || sleep 2
+			[ -e /dev/snd/controlC0 ] || sleep 2
 			$alsactl -f $asoundcfg restore ${CARDNUM}
 		done
 	else
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-0.9.5 b/media-sound/alsa-utils/files/digest-alsa-utils-0.9.5
deleted file mode 100644
index c9d5a863bc19..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-0.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6071c658130325e9d4665e2e4db3180 alsa-utils-0.9.5.tar.bz2 108154
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.0_rc2 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.0_rc2
deleted file mode 100644
index 8a310578b7e1..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85150c8abd8ffd73ef5538c8914c9e7c alsa-utils-1.0.0rc2.tar.bz2 133177
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.1 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.1
deleted file mode 100644
index 82e393224b1b..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff54117a83d9edb3b9ad0ccc93ebde51 alsa-utils-1.0.1.tar.bz2 133171