Fix init script to work with snd-card-x alias, #171009.

(Portage version: 2.1.2.2)

4 files changed, 98 insertions, 3 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 45903ed4ef19..69f231013f2c 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.198 2007/03/14 13:55:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.199 2007/03/15 11:33:25 uberlord Exp $
+
+*alsa-utils-1.0.14_rc2-r3 (15 Mar 2007)
+
+  15 Mar 2007; Roy Marples <uberlord@gentoo.org> files/alsasound.initd,
+  +alsa-utils-1.0.14_rc2-r3.ebuild:
+  Fix init script to work with snd-card-x alias, #171009.
 
   14 Mar 2007; Roy Marples <uberlord@gentoo.org> files/alsasound.initd:
   Typo, #170586 thanks to Patrice Beaud.
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild
new file mode 100644
index 000000000000..579937ae5340
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2-r3.ebuild,v 1.1 2007/03/15 11:33:25 uberlord Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls midi"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.14_rc1"
+RDEPEND="${DEPEND}
+	virtual/modutils
+	sys-apps/pciutils"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils with midi support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
+	epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch"
+	epatch "${FILESDIR}/${P}-seq.patch"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable midi sequencer) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	newinitd "${FILESDIR}/alsasound.initd" alsasound
+	newconfd "${FILESDIR}/alsasound.confd" alsasound
+	insinto /etc/modules.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa
+
+	keepdir /var/lib/alsa
+}
+
+pkg_postinst() {
+	echo
+	elog "To take advantage of the init script, and automate the process of"
+	elog "loading and unloading the ALSA sound drivers as well as"
+	elog "storing and restoring sound-card mixer levels you should"
+	elog "add alsasound to the boot runlevel. You can do this as"
+	elog "root like so:"
+	elog "	# rc-update add alsasound boot"
+	echo
+}
diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd
index 6192164d4abd..5e6dbfb15e9f 100644
--- a/media-sound/alsa-utils/files/alsasound.initd
+++ b/media-sound/alsa-utils/files/alsasound.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.2 2007/03/14 13:55:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.3 2007/03/15 11:33:25 uberlord Exp $
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -15,7 +15,7 @@ depend() {
 
 load_modules() {
 	# List of drivers for each card.
-	local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]+\) .*/\1/p')"
+	local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')"
 
 	# Fall back on the automated aliases if we don't have ALSA configured properly...
 	if [ -z "${DRIVERS}" ] && \
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r3 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r3
new file mode 100644
index 000000000000..8db4c3f3529e
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14_rc2-r3
@@ -0,0 +1,3 @@
+MD5 7e9f132b34b7773d2a29b0ff14719a49 alsa-utils-1.0.14rc2.tar.bz2 981123
+RMD160 9975bc5c71df585ad1818647a1abb2be68910403 alsa-utils-1.0.14rc2.tar.bz2 981123
+SHA256 306bd7c4436c1c56a0a499317e23b5b58aea3718df17c138ab0df56fd9bf3e0c alsa-utils-1.0.14rc2.tar.bz2 981123