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

Package-Manager: portage-2.1.1_rc1-r4

diff --git a/app-admin/system-config-soundcard/ChangeLog b/app-admin/system-config-soundcard/ChangeLog
index 3b16dce1bb335db086554ac229c57ec71c57a0f8..1412a8f8d9e731b8f1125436ef9ee86efbd57bf8 100644 (file)
--- 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/Manifest b/app-admin/system-config-soundcard/Manifest
index 83f05c1ce26fe9d5fce3cc32f575a02ff6369514..0b1b5b0018874c2a6fa0c7ba02b46bfb28389efc 100644 (file)
--- a/app-admin/system-config-soundcard/Manifest
+++ b/app-admin/system-config-soundcard/Manifest
@@ -1,16 +1,20 @@
+AUX 2.0.1-gentooify.patch 3254 RMD160 e420ae44b81a0595a92faea27f4244132ab581dd SHA1 ebbd40a889f84bfaf6d3a903ea282ab2eba782cb SHA256 7a1276f965091a521f3a5cea9126bac6fd7c315cf37487348627652462faf9bf
+MD5 f04af3c3010113b3ef243bf3a22944e4 files/2.0.1-gentooify.patch 3254
+RMD160 e420ae44b81a0595a92faea27f4244132ab581dd files/2.0.1-gentooify.patch 3254
+SHA256 7a1276f965091a521f3a5cea9126bac6fd7c315cf37487348627652462faf9bf files/2.0.1-gentooify.patch 3254
 AUX 2.0.1-import-i18n-backendproc.patch 515 RMD160 7324401f8aed3c223acf4cbcc6c0be8dd63af876 SHA1 844930e7338911487ba7ad0553628a2850fcfb7a SHA256 8d2396d0eb860052398acb5aff874019cf7d5efb1d856273826a115c05c91d72
 MD5 1c2b7ad0b36658c51382eeba073c7f19 files/2.0.1-import-i18n-backendproc.patch 515
 RMD160 7324401f8aed3c223acf4cbcc6c0be8dd63af876 files/2.0.1-import-i18n-backendproc.patch 515
 SHA256 8d2396d0eb860052398acb5aff874019cf7d5efb1d856273826a115c05c91d72 files/2.0.1-import-i18n-backendproc.patch 515
 DIST system-config-soundcard-2.0.1-2.src.rpm 1062570 RMD160 b5db9208c075dff728cc9a4229c0a2237e7d1a0e SHA1 9dac373edec2d216cee081d0f0fa963fa0363a36 SHA256 ca362c64852056d6c4b7af42003b85633fd15de9245943df254efd416144f6b0
-EBUILD system-config-soundcard-2.0.1.ebuild 1289 RMD160 51fd7bbe261b0a39e911c2b716a500cb56164ee6 SHA1 6fb467ac3dde833f0914a2092b715ce1c0b8f419 SHA256 907192e708b90f7c21e670f10379c942269d1e3d925b3d35b9cf36286e0c6c77
-MD5 42c7f717986e277c14346b2279b37262 system-config-soundcard-2.0.1.ebuild 1289
-RMD160 51fd7bbe261b0a39e911c2b716a500cb56164ee6 system-config-soundcard-2.0.1.ebuild 1289
-SHA256 907192e708b90f7c21e670f10379c942269d1e3d925b3d35b9cf36286e0c6c77 system-config-soundcard-2.0.1.ebuild 1289
-MISC ChangeLog 640 RMD160 5b1a6f5b1e6639c03164a8c442f50340dfae11b6 SHA1 219e15992c377c81b928f9ccebc63b3d1d9867cc SHA256 c9e6742d703fbf378f5be89ddf760ede31cda32a8c75199620b4f129b88dd960
-MD5 683f3d09d492c7fe655d53f9035010a8 ChangeLog 640
-RMD160 5b1a6f5b1e6639c03164a8c442f50340dfae11b6 ChangeLog 640
-SHA256 c9e6742d703fbf378f5be89ddf760ede31cda32a8c75199620b4f129b88dd960 ChangeLog 640
+EBUILD system-config-soundcard-2.0.1.ebuild 1452 RMD160 a62ec8f7510beed408827ebc610f2b89dddc0a20 SHA1 79a2ebe819919316fe020526105b9997c6b58365 SHA256 264cf8e2cf990a163153b18eca58e04126543e97d5cf0f7202e72e67d23de761
+MD5 4dc985f724a4561900ac1adaa9cd64d4 system-config-soundcard-2.0.1.ebuild 1452
+RMD160 a62ec8f7510beed408827ebc610f2b89dddc0a20 system-config-soundcard-2.0.1.ebuild 1452
+SHA256 264cf8e2cf990a163153b18eca58e04126543e97d5cf0f7202e72e67d23de761 system-config-soundcard-2.0.1.ebuild 1452
+MISC ChangeLog 846 RMD160 0c541ecd40b81db449ce160a700a206b8bb9b3e6 SHA1 13c2b75949d86e7f86e84c547669d4326948d97f SHA256 90e04898b114bdce7c8107d98dd634c1316cb66345349db6b7804424092e86fb
+MD5 51711c984854378dee07b858b5d1afc5 ChangeLog 846
+RMD160 0c541ecd40b81db449ce160a700a206b8bb9b3e6 ChangeLog 846
+SHA256 90e04898b114bdce7c8107d98dd634c1316cb66345349db6b7804424092e86fb ChangeLog 846
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
 MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252
 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252

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 (file)
index 0000000..314b68e
--- /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 b511ee54e11a3b03b50cb87e6f808ee4d24c1817..0f7a4f0edd0b8fcb75b4d86a6906cb2467427b1b 100644 (file)
--- 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}
 }