Adding gentoo support to alsaconf. Closes bug #47289. Thanks Carter Smithhart <derheld42@derheld.net>.

3 files changed, 50 insertions, 2 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 2b7a86594c61..3976a184669b 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.51 2004/04/08 08:06:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.52 2004/04/17 07:20:25 eradicator Exp $
+
+  17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.4.ebuild, files/alsa-utils-1.0.4-alsaconf.patch:
+  Adding gentoo support to alsaconf. Closes bug #47289. Thanks Carter Smithhart
+  <derheld42@derheld.net>.
 
   08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-utils-0.5.10-r8.ebuild, alsa-utils-0.9.8.ebuild:
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild
index c9a9dc2c9c1d..ddd04772ae74 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild
@@ -1,6 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.4.ebuild,v 1.2 2004/04/17 07:20:25 eradicator Exp $
+
+inherit eutils
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -18,6 +20,13 @@ S=${WORKDIR}/${MY_P}
 
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-alsaconf.patch
+}
+
 src_install() {
 	local ALSA_UTILS_DOCS="COPYING ChangeLog README TODO
 		seq/aconnect/README.aconnect
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.4-alsaconf.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.4-alsaconf.patch
new file mode 100644
index 000000000000..5218c25ba2d9
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.4-alsaconf.patch
@@ -0,0 +1,34 @@
+--- alsaconf/alsaconf.in.orig	2004-04-17 00:06:35.000000000 -0700
++++ alsaconf/alsaconf.in	2004-04-17 00:10:27.000000000 -0700
+@@ -26,6 +26,8 @@
+ # Check for GNU/Linux distributions
+ if [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ]; then
+   distribution="suse"
++elif [ -f /etc/gentoo-release ]; then
++  distribution="gentoo"
+ elif [ -f /etc/debian_version ]; then
+   distribution="debian"
+ elif [ -f /etc/mandrake-release ]; then
+@@ -153,7 +155,9 @@
+ 
+ # cfgfile = base config file to remove/update the sound setting
+ # cfgout = new config file to write the sound setting (if different from $cfgfile)
+-if [ "$kernel" = "new" ]; then
++if [ "$distribution" = "gentoo" ]; then
++  cfgfile="/etc/modules.d/alsa"
++elif [ "$kernel" = "new" ]; then
+   if [ -d /etc/modprobe.d ]; then
+     cfgout="/etc/modprobe.d/sound"
+   fi
+@@ -649,7 +653,10 @@
+ 
+     farewell "OK, driver $CARD_DRIVER is configured."
+     clear
+-    if [ "$distribution" = "debian" ]; then
++    if [ "$distribution" = "gentoo" ]; then
++      echo Running modules-update...
++      modules-update
++    elif [ "$distribution" = "debian" ]; then
+       echo Running update-modules...
+       update-modules
+     fi