Add gentooify patch to use /etc/modules.d/alsa instead of /etc/modprobe.conf.

(Portage version: 2.1.1_rc1-r4)

3 files changed, 73 insertions, 2 deletions

diff --git a/app-admin/system-config-soundcard/ChangeLog b/app-admin/system-config-soundcard/ChangeLog
index 3b16dce1bb33..1412a8f8d9e7 100644
--- a/app-admin/system-config-soundcard/ChangeLog
+++ b/app-admin/system-config-soundcard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/system-config-soundcard
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-soundcard/ChangeLog,v 1.2 2006/09/05 21:56:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-soundcard/ChangeLog,v 1.3 2006/09/06 06:19:18 dberkholz Exp $
+
+  06 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/2.0.1-gentooify.patch, system-config-soundcard-2.0.1.ebuild:
+  Add gentooify patch to use /etc/modules.d/alsa instead of /etc/modprobe.conf.
 
   05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   system-config-soundcard-2.0.1.ebuild:
diff --git a/app-admin/system-config-soundcard/files/2.0.1-gentooify.patch b/app-admin/system-config-soundcard/files/2.0.1-gentooify.patch
new file mode 100644
index 000000000000..314b68ecc96e
--- /dev/null
+++ b/app-admin/system-config-soundcard/files/2.0.1-gentooify.patch
@@ -0,0 +1,60 @@
+Index: src/soundcardBackend.py
+===================================================================
+RCS file: /usr/local/CVS/redhat-config-soundcard/src/soundcardBackend.py,v
+retrieving revision 1.50
+diff -u -b -B -r1.50 soundcardBackend.py
+--- src/soundcardBackend.py	21 Jul 2006 07:37:22 -0000	1.50
++++ src/soundcardBackend.py	6 Sep 2006 06:12:47 -0000
+@@ -233,7 +233,7 @@
+     def rewriteModprobe(self, cardArray):
+         
+         try:
+-            fd = open('/etc/modprobe.conf', 'r')
++            fd = open('/etc/modules.d/alsa', 'r')
+             list = fd.readlines()
+             fd.close()
+         except:
+@@ -279,8 +279,8 @@
+                 modprobe.append("options %s index=%d\n" % (card.driver, card.index))
+ 
+         try:
+-            os.rename('/etc/modprobe.conf', '/etc/modprobe.conf.scs')
+-            fd = open('/etc/modprobe.conf', 'w')
++            os.rename('/etc/modules.d/alsa', '/etc/modules.d/alsa.scs')
++            fd = open('/etc/modules.d/alsa', 'w')
+             fd.writelines(modprobe)
+             fd.close()
+         except:            
+@@ -365,7 +365,7 @@
+         if self.card_index_changed:
+             ret_mod = self.rewriteModprobe(cardArray)
+             if not ret_mod:
+-                errorDialog(_("Unable to write %s!") % ("/etc/modprobe.conf"))
++                errorDialog(_("Unable to write %s!") % ("/etc/modules.d/alsa"))
+             elif ret_mod:
+                 self.unloadModules()
+                 self.loadModules(cardArray)
+Index: src/system-config-soundcard.logger
+===================================================================
+RCS file: /usr/local/CVS/redhat-config-soundcard/src/system-config-soundcard.logger,v
+retrieving revision 1.2
+diff -u -b -B -r1.2 system-config-soundcard.logger
+--- src/system-config-soundcard.logger	30 Jun 2006 12:07:38 -0000	1.2
++++ src/system-config-soundcard.logger	6 Sep 2006 06:12:47 -0000
+@@ -6,13 +6,13 @@
+ echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1
+ echo -e "------- lspci -vn --------\n`lspci -vn`\n" >> $LOG_FILE 2>&1
+ echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1
+-echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1
++echo -e "------- /etc/modules.d/alsa --------\n`cat /etc/modules.d/alsa`\n" >> $LOG_FILE 2>&1
+ echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1
+ echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1
+ echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1
+ echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1
+-echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1
+-echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1
++echo -e "------- qlist -I alsa-lib --------\n`qlist -I alsa-lib`\n" >> $LOG_FILE 2>&1
++echo -e "------- qlist -I alsa-utils --------\n`qlist -I alsa-utils`\n" >> $LOG_FILE 2>&1
+ echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1
+ echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1
+ echo -e "------- /etc/sysconfig/hwconf --------\n`cat /etc/sysconfig/hwconf`\n" >> $LOG_FILE 2>&1
diff --git a/app-admin/system-config-soundcard/system-config-soundcard-2.0.1.ebuild b/app-admin/system-config-soundcard/system-config-soundcard-2.0.1.ebuild
index b511ee54e11a..0f7a4f0edd0b 100644
--- a/app-admin/system-config-soundcard/system-config-soundcard-2.0.1.ebuild
+++ b/app-admin/system-config-soundcard/system-config-soundcard-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-soundcard/system-config-soundcard-2.0.1.ebuild,v 1.2 2006/09/05 21:56:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-soundcard/system-config-soundcard-2.0.1.ebuild,v 1.3 2006/09/06 06:19:18 dberkholz Exp $
 
 inherit python eutils rpm
 
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	rpm_src_unpack
+	cd "${S}"
 	epatch "${FILESDIR}"/${PV}-import-i18n-backendproc.patch
+	epatch "${FILESDIR}"/${PV}-gentooify.patch
 }
 
 src_install() {
@@ -46,6 +48,11 @@ src_install() {
 	fperms 644 /etc/pam.d/${PN}
 }
 
+pkg_postinst() {
+	elog "Run modules-update after using ${PN}"
+	elog "to ensure its changes take effect."
+}
+
 pkg_postrm() {
 	python_mod_cleanup /usr/share/${PN}
 }