Always load snd-seq to make timidity work when no real sequencer. Also, fix module loading on 2.6 kernels. Changed ebuilds' reference from update-modules to modules-update. Closes bug #31849

7 files changed, 37 insertions, 24 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index dd705471578f..6b26d876b5ed 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,17 @@
 # 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.42 2004/02/09 12:01:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.43 2004/02/12 12:20:01 eradicator Exp $
+
+  12 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-0.9.8.ebuild, alsa-utils-1.0.0_rc2.ebuild,
+  alsa-utils-1.0.1.ebuild, alsa-utils-1.0.2.ebuild, files/alsasound:
+  Always load snd-seq to make timidity work when no real sequencer. Also, fix
+  module loading on 2.6 kernels. Changed ebuilds' reference from update-modules
+  to modules-update.  Closes bug #31849.
+
+  10 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
+  Added snd-seq to SEQUENCERS to load so timidity will work even if we have no
+  real sequenced. Closes bug #30942.
 
   09 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> files/alsasound:
   Updated alsasound init script to not load sequencer modules that are compiled
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index b135be5de55b..5a2b0ab6623f 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,13 +1,13 @@
 MD5 140f4dd3c22323f5e9f671306f048d4d alsa-utils-0.9.2.ebuild 907
 MD5 0d1f89bc0713a7239243219ee57a1b7b alsa-utils-0.9.0_rc2.ebuild 921
-MD5 6c070ab05ab65cdade3da66cabd578a1 alsa-utils-1.0.1.ebuild 1945
-MD5 dcb320b60b86736993eccf725d0b93f7 alsa-utils-1.0.0_rc2.ebuild 1951
-MD5 85e4428528b2102ace3267899b9245df alsa-utils-0.9.8.ebuild 1851
+MD5 a5acd625ef54f8f5fa39c0fd4cf9936c alsa-utils-1.0.1.ebuild 1948
+MD5 cb7c28bed532832f9fd55119f73b8f6d alsa-utils-1.0.0_rc2.ebuild 1952
+MD5 7528fe3c03ea6f922009aaa0f21e628c alsa-utils-0.9.8.ebuild 1850
 MD5 b268f1eb52b27b8146ddf58e76c55d4f alsa-utils-0.5.10-r8.ebuild 970
 MD5 e6680e624126367a971065c1507240c6 alsa-utils-0.9.5.ebuild 899
-MD5 8e11941d962dbc6b6c605fd4f1a7952a ChangeLog 6749
+MD5 50020f3aa1b5e8894d62224a0ef16e7c ChangeLog 7322
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 fd6a240dd5c9f8937c44217ff4117e35 alsa-utils-1.0.2.ebuild 1940
+MD5 2f04e1511bffe93b3e4b6a4eaebda90c alsa-utils-1.0.2.ebuild 1943
 MD5 f8aff370f9c369682ac793f5b3f4886e files/alsa-modules.conf-rc 1158
 MD5 59a93bf64737644e4001cbb6ad5387b4 files/digest-alsa-utils-0.9.0_rc2 71
 MD5 55414f65ffecf5f44fa35295dae8bf19 files/digest-alsa-utils-0.9.2 69
@@ -19,4 +19,4 @@ MD5 ad803523008747726c87b9c505517f4c files/digest-alsa-utils-1.0.0_rc2 72
 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
-MD5 8ce2200b3c14dc7b70e5a082cf784ffb files/alsasound 5127
+MD5 ac9fe7947f1089b96126675abaf5a040 files/alsasound 5263
diff --git a/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild b/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild
index 1173b539d44a..3b172948fa59 100644
--- a/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-0.9.8.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-0.9.8.ebuild,v 1.4 2004/01/17 03:18:40 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-0.9.8.ebuild,v 1.5 2004/02/12 12:20:01 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -52,8 +52,8 @@ pkg_postinst() {
 	einfo "	# rc-update add alsasound boot"
 	echo
 	einfo "You will also need to edit the file /etc/modules.d/alsa"
-	einfo "and run update-modules. You can do this like so:"
-	einfo "	# nano -w /etc/modules.d/alsa && update-modules"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
 	echo
 	ewarn "Pausing for 20 seconds to give you time to read..."
 	sleep 20
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
index f70918b4df83..e52fd787a08f 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.0_rc2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2 2003/12/17 04:36:29 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.0_rc2.ebuild,v 1.3 2004/02/12 12:20:01 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -54,8 +54,8 @@ pkg_postinst() {
 	einfo "	# rc-update add alsasound boot"
 	echo
 	einfo "You will also need to edit the file /etc/modules.d/alsa"
-	einfo "and run update-modules. You can do this like so:"
-	einfo "	# nano -w /etc/modules.d/alsa && update-modules"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
 	echo
 	ewarn "Pausing for 20 seconds to give you time to read..."
 	sleep 20
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.1.ebuild
index 28f3fe19d250..b34130fec104 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-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-sound/alsa-utils/alsa-utils-1.0.1.ebuild,v 1.1 2004/01/10 16:39:37 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.1.ebuild,v 1.2 2004/02/12 12:20:01 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -54,8 +54,8 @@ pkg_postinst() {
 	einfo "	# rc-update add alsasound boot"
 	echo
 	einfo "You will also need to edit the file /etc/modules.d/alsa"
-	einfo "and run update-modules. You can do this like so:"
-	einfo "	# nano -w /etc/modules.d/alsa && update-modules"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
 	echo
 	ewarn "Pausing for 20 seconds to give you time to read..."
 	sleep 20
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 9ed46a975efd..534e72be31be 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.1 2004/01/27 19:35:04 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.2.ebuild,v 1.2 2004/02/12 12:20:01 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -53,8 +53,8 @@ pkg_postinst() {
 	einfo "	# rc-update add alsasound boot"
 	echo
 	einfo "You will also need to edit the file /etc/modules.d/alsa"
-	einfo "and run update-modules. You can do this like so:"
-	einfo "	# nano -w /etc/modules.d/alsa && update-modules"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
 	echo
 	ewarn "Pausing for 20 seconds to give you time to read..."
 	sleep 20
diff --git a/media-sound/alsa-utils/files/alsasound b/media-sound/alsa-utils/files/alsasound
index afe25219d5c3..6816054f933f 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.8 2004/02/09 12:01:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound,v 1.9 2004/02/12 12:20:01 eradicator Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -75,7 +75,7 @@ start() {
 		do
 			if [ ! "${DRIVER}" = off ] &&
 			   [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER}\$"` ] &&
-			   [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER/-/_}\$"` ]; then
+			   [ -z `cut -d' ' -f1 /proc/modules | egrep "^${DRIVER//-/_}\$"` ]; then
 				einfo "Loading: ${DRIVER}"
 				/sbin/modprobe ${DRIVER}
 			fi
@@ -84,11 +84,13 @@ start() {
 		sleep 1
 
 		if [ -f /proc/asound/seq/drivers ] ; then
-			SEQUENCERS="$(awk -F, '$2~/^empty$/ {print $1}' /proc/asound/seq/drivers)"
+			# We want to ensure snd-seq is loaded as it is needed for things like timidity even if
+			# we don't use a real sequencer.
+			SEQUENCERS="snd-seq $(awk -F, '$2~/^empty$/ {print $1}' /proc/asound/seq/drivers)"
 			for SEQUENCER in ${SEQUENCERS}
 			do
 				if [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER}\$"` ] &&
-				   [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER/-/_}\$"` ]; then
+				   [ -z `cut -d' ' -f1 /proc/modules | egrep "^${SEQUENCER//-/_}\$"` ]; then
 					einfo "Loading: ${SEQUENCER}"
 					[ -n "${SEQUENCER}" ] && /sbin/modprobe ${SEQUENCER}
 				fi