Fix alsaconf trying to load snd-*** module, thanks grdscarabe@grdscarabe.net for the patch in bug #96467.

(Portage version: 2.1_pre7-r5)

5 files changed, 118 insertions, 11 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 5bfce680d81e..fb1498f8cc0c 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.140 2006/04/11 19:38:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.141 2006/04/18 17:06:38 flameeyes Exp $
+
+*alsa-utils-1.0.11_rc5-r1 (18 Apr 2006)
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch,
+  +alsa-utils-1.0.11_rc5-r1.ebuild:
+  Fix alsaconf trying to load snd-*** module, thanks grdscarabe@grdscarabe.net
+  for the patch in bug #96467.
 
 *alsa-utils-1.0.11_rc5 (11 Apr 2006)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 5667d76da573..0342b836b71c 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ea3809f45fdfd79b0aa1abfcbe3e72ad ChangeLog 21474
 RMD160 2a3620d1586d973e854dfb16c57ee378f1d5b178 ChangeLog 21474
 SHA256 e6fe43ca7749a2143898a92dd62a533244268555edb8c41ed715aa2b0e8f8d11 ChangeLog 21474
@@ -13,6 +10,9 @@ SHA256 7aad8e4e9ea34dcb56671fef13127ee6c0cb188d0890698bc520f08165f8ba97 alsa-uti
 MD5 010728fc07abdd6d3c7a687f464296fa alsa-utils-1.0.11_rc4.ebuild 2509
 RMD160 f8ebac7fc2b36c3b8a100485d799570175b2df1c alsa-utils-1.0.11_rc4.ebuild 2509
 SHA256 3cbfcd48e6e204a3b048d1b65dc96f49aeef1ccbbe98e12d7bccc8b37642aeec alsa-utils-1.0.11_rc4.ebuild 2509
+MD5 acc0315ded2c92d648a7b40ec68ba74c alsa-utils-1.0.11_rc5-r1.ebuild 2560
+RMD160 a7bda7fa22f71d66336ca834da724a66838ba1d6 alsa-utils-1.0.11_rc5-r1.ebuild 2560
+SHA256 4d96fd2a7b416a3b0a66a44bfdbe094b18c54f9b9f84f7a038c86f4163bcc1bc alsa-utils-1.0.11_rc5-r1.ebuild 2560
 MD5 3389cae74594006bde491bc3434a4e42 alsa-utils-1.0.11_rc5.ebuild 2509
 RMD160 8540ac6431e1fcfeed18f8a673b0ee5904231d43 alsa-utils-1.0.11_rc5.ebuild 2509
 SHA256 5bcbf0129ba82fc84c00be6c51b024d10e5b8b6b541886c386a0ebdbb778424f alsa-utils-1.0.11_rc5.ebuild 2509
@@ -25,6 +25,9 @@ SHA256 c1472243755fb4fed41329d414f2f291e71dc833f269832e7de941848ea27bd0 files/al
 MD5 5d34abc973abfd894d764986b8408cd6 files/alsa-utils-1.0.11_rc2-nls.patch 587
 RMD160 9dff7b5f75295834457ff93a13d485d66685cdf3 files/alsa-utils-1.0.11_rc2-nls.patch 587
 SHA256 c68819938d0241dd38293b0e411921b3ad580390183880fd364361fe71cb6d51 files/alsa-utils-1.0.11_rc2-nls.patch 587
+MD5 6d9f0b77efeae08719b53549edfb9507 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
+RMD160 cfb4dac18bfacf45bbb78e0c3278b431d5015d30 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
+SHA256 e4da9da92bb88fbf66897da35b588bb81b6d4899a129d59237fd4d65cdd59a55 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
 MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106
 RMD160 edc95c5ed367808e7450ea79367331764fa84250 files/alsasound 7106
 SHA256 ea5d3df2b9e6dbb7571dc23e297492c0cff756445b97fd7601db8a632f291320 files/alsasound 7106
@@ -46,16 +49,12 @@ SHA256 820551397a2b640c911bd800fc9e46b8029ca7b5a8df8451bc7405bd4306b604 files/di
 MD5 602b3c4cb687f95d3b787d421f331dc3 files/digest-alsa-utils-1.0.11_rc5 265
 RMD160 1b89958bc061b9aa4019be8b4ee19e30cc318287 files/digest-alsa-utils-1.0.11_rc5 265
 SHA256 05ed50dbd147eb036d6c7f4c9fc380c8d7cc146f3510ae956fa4fb9e6d97dd4e files/digest-alsa-utils-1.0.11_rc5 265
+MD5 602b3c4cb687f95d3b787d421f331dc3 files/digest-alsa-utils-1.0.11_rc5-r1 265
+RMD160 1b89958bc061b9aa4019be8b4ee19e30cc318287 files/digest-alsa-utils-1.0.11_rc5-r1 265
+SHA256 05ed50dbd147eb036d6c7f4c9fc380c8d7cc146f3510ae956fa4fb9e6d97dd4e files/digest-alsa-utils-1.0.11_rc5-r1 265
 MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70
 RMD160 aa1a698ec98d7832c18ac30c8b5daf28d023aa02 files/digest-alsa-utils-1.0.9a 70
 SHA256 9b4130f0aadcea0c239581f1fd222e447d97b1d75b9d9a3c6f9a895fdc47e4f6 files/digest-alsa-utils-1.0.9a 70
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEPAWuAiZjviIA2XgRAjsIAJ9f2PqQm1usTi1RITaVO7UdWnBhVgCgu+iW
-s39FAelIgb0LzZ8xkoAGhqM=
-=kFsV
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.11_rc5-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.11_rc5-r1.ebuild
new file mode 100644
index 000000000000..b65b48933093
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.11_rc5-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 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.11_rc5-r1.ebuild,v 1.1 2006/04/18 17:06:38 flameeyes Exp $
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.10_rc1"
+RDEPEND="${DEPEND}
+	sys-apps/pciutils"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
+	epatch "${FILESDIR}/${P}-alsaconf-redirect.patch"
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	make DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	newconfd ${FILESDIR}/alsasound.confd alsasound
+	insinto /etc/modules.d
+	newins ${FILESDIR}/alsa-modules.conf-rc alsa
+	newinitd ${FILESDIR}/alsasound-1.0.10_rc2 alsasound
+}
+
+pkg_postinst() {
+	echo
+	einfo "The alsasound initscript is now provided by alsa-utils"
+	einfo "instead of alsa-driver for compatibility with kernel-sources"
+	einfo "which provide ALSA internally."
+	echo
+	einfo "To take advantage of this, and automate the process of"
+	einfo "loading and unloading the ALSA sound drivers as well as"
+	einfo "storing and restoring sound-card mixer levels you should"
+	einfo "add alsasound to the boot runlevel. You can do this as"
+	einfo "root like so:"
+	einfo "	# rc-update add alsasound boot"
+	echo
+	einfo "You will also need to edit the file /etc/modules.d/alsa"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
+	echo
+
+	if use sparc; then
+		ewarn "Old versions of alsa-drivers had a broken snd-ioctl32 module"
+		ewarn "which causes sparc64 machines to lockup on such tasks as"
+		ewarn "changing the volume.  Because of this, it is VERY important"
+		ewarn "that you do not use the snd-ioctl32 modules contained in"
+		ewarn "development-sources or <=gentoo-dev-sources-2.6.7-r14.  Doing so"
+		ewarn "may result in an unbootable system if you start alsasound at boot."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch
new file mode 100644
index 000000000000..89f74b74466a
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch
@@ -0,0 +1,13 @@
+Index: alsa-utils-1.0.11rc5/alsaconf/alsaconf.in
+===================================================================
+--- alsa-utils-1.0.11rc5.orig/alsaconf/alsaconf.in
++++ alsa-utils-1.0.11rc5/alsaconf/alsaconf.in
+@@ -1394,7 +1394,7 @@ if [ x$devs_found != x ]; then
+          Following card(s) are found on your system.
+          Choose a soundcard to configure:
+ ")
+-    $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" 2> $FOUND || acex 0
++    $DIALOG --title "$title" --menu "$msg" 17 76 8 "${devs_found[@]}" --output-fd 3 3> $FOUND || acex 0
+     card=`head -n 1 $FOUND`
+     if [ "$card" = "legacy" ]; then
+ 	ac_config_legacy
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.11_rc5-r1 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.11_rc5-r1
new file mode 100644
index 000000000000..07183272e3c4
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.11_rc5-r1
@@ -0,0 +1,3 @@
+MD5 78b50cd8fd05739e5b57e15b33d46dca alsa-utils-1.0.11rc5.tar.bz2 989412
+RMD160 367bd494a73c966062227b535fa8ee764308130c alsa-utils-1.0.11rc5.tar.bz2 989412
+SHA256 673ed428b1d8739ed0061c71876b5677fccce5b255f3d088b61ac69f13cd4ec2 alsa-utils-1.0.11rc5.tar.bz2 989412