Revision bump to fix bug #299362 following upstream indications and applying upstream patches that will be included in 1.0.24.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 152 insertions, 6 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 41b40b73fcc2..29537d50eba3 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.295 2010/04/16 22:21:09 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.296 2010/09/07 11:57:12 pacho Exp $
+
+*alsa-utils-1.0.23-r1 (07 Sep 2010)
+
+  07 Sep 2010; Pacho Ramos <pacho@gentoo.org> +alsa-utils-1.0.23-r1.ebuild,
+  +files/alsa-utils-1.0.23-alsactl-output.patch,
+  +files/alsa-utils-1.0.23-alsactl-output2.patch:
+  Revision bump to fix bug #299362 following upstream indications and
+  applying upstream patches that will be included in 1.0.24.
 
 *alsa-utils-1.0.23 (16 Apr 2010)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 926e52aba1c3..9ff74dbc39b1 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -11,6 +11,8 @@ AUX alsa-utils-1.0.20-modprobe.d.patch 501 RMD160 4b2aa8676fc23b029a66e8a699be5f
 AUX alsa-utils-1.0.21-init_default.patch 3023 RMD160 b9cd2707fac2958b86c98c84b3aa99f014cc9317 SHA1 e337319d9c0ee61327b5a01993da76c016cd3be7 SHA256 36545d8e6c80a65bcf07f2d80ccbb3f05b7670e7c2705133c124dbced29c7e9b
 AUX alsa-utils-1.0.21-modprobe.d.patch 501 RMD160 072188940d24966698fd9b488a13eead2d8d114d SHA1 c1097f57094559512b974f705918a07d4e232d11 SHA256 a39df3d44dadfd0469e4d0dca836b1db38e06b8cbbf68ca33e368188f1b45c96
 AUX alsa-utils-1.0.22-modprobe.d.patch 501 RMD160 072188940d24966698fd9b488a13eead2d8d114d SHA1 c1097f57094559512b974f705918a07d4e232d11 SHA256 a39df3d44dadfd0469e4d0dca836b1db38e06b8cbbf68ca33e368188f1b45c96
+AUX alsa-utils-1.0.23-alsactl-output.patch 1010 RMD160 88bdedef021eafbb028a5cc44fb411b5fd323e77 SHA1 e45c2faa77f29d0f25c528cfa32cfc203f2b3424 SHA256 b26deef95b4e665ae9e8e8b5c7ec745876126b5a81804e79833abcdee8a0ddb0
+AUX alsa-utils-1.0.23-alsactl-output2.patch 853 RMD160 e5a3d15f69cbb37f1c0b7adeb4497e27d458b345 SHA1 b3cc5dea4f750cce477d5892733182f5a7c2f8a9 SHA256 5425e156b8f7f82a088cd7fa2cd17843f439f465c82e3a18f7f4ca8c3ebd9b3e
 AUX alsa-utils-1.0.23-modprobe.d.patch 504 RMD160 3af095095834ff8a6578338f7999047783989ce5 SHA1 8c42ea316a26108dff1985867717e81e57496d28 SHA256 3f6116f467f52eba2e2de46df24a08c99231fdf83ab92dd5f0051aabc5aee077
 AUX alsasound-1.0.19-r1.initd 6868 RMD160 9e7e9ac4a2c2e98def8c1e5498bb6631fd269a9d SHA1 c5a716afde0da422d7d3a3160f5a21024f7ea660 SHA256 b9d53242b7aae9b6517677b65ff4d9412fb347769adc8f9efb7d902b28731130
 AUX alsasound-1.0.19.confd 1012 RMD160 42d0abf97bb01236bcfb7f1cf758696844550a84 SHA1 d0b1ae65379cb8f54a9dc1b9bed9229c5cd9c187 SHA256 3740d675d0c403530a71813472332decbfe9620545e4c248511cacd89b85f35b
@@ -27,13 +29,14 @@ DIST alsa-utils-1.0.23.tar.bz2 1076937 RMD160 af741d41fec054a7173eba5827adb01afb
 EBUILD alsa-utils-1.0.20-r5.ebuild 2776 RMD160 42eb94cec24c47722d674261e6c2c3325b97e6fb SHA1 c87c64d77daf8d9ec06492780a8a6cfeed583151 SHA256 f3974908123c3cb93be8677c9ec1132a4a9309530f43c474feb747f72aef7e73
 EBUILD alsa-utils-1.0.21-r1.ebuild 2727 RMD160 193c4cb2a194d57d1765874e792e53166bc56217 SHA1 f6e771ebd34b0802345fa87ba32cd638665e46d5 SHA256 b6de1fcb14ebb68910f36256797827d4beeb5114c3ae738b576362984b1259fe
 EBUILD alsa-utils-1.0.22-r1.ebuild 2878 RMD160 d501e275b2abe0f3d36da64c630ea6b05fc084da SHA1 0a5507bd86f85d73899a21ff207e1afeb509961d SHA256 df56085b7dcbbf669ad2960c62f9df845b7ccdb7519d89af0bcb9acc40c52088
+EBUILD alsa-utils-1.0.23-r1.ebuild 3234 RMD160 0f8d0d43228b859103fdcf93151e1c3b316d722c SHA1 797cb0a9265804684c9febbb86970cc1c7899d4d SHA256 a18f7d4dc6dbc678c0d1f7bb172c0d87ae7f4b866a76dfdbbb93ab6e81aabdcd
 EBUILD alsa-utils-1.0.23.ebuild 2874 RMD160 3f27b4357cd0141376c21ed932b67d5f8ebeba58 SHA1 1ea3d10691983aa6a11f63849ad409faafac1188 SHA256 9e843017c54e4e005c20399e541d3eef828596fcd8d25bd30c82eeaa9701e12c
-MISC ChangeLog 45207 RMD160 274ac5c2e7fec975c9bae9131aca81e80872f291 SHA1 b5fb6ffe40cb5de1877df9801c11120711939c5d SHA256 4e96c2392af8eb457718a01ad22416e1870d8cc136efb4b52f90515d9e039c36
+MISC ChangeLog 45548 RMD160 191d458fc966e6edf91071ab4dc59f49c1c0bf73 SHA1 32dccadcb4676536c393996a2aee18dd4973e2a6 SHA256 0e5878e5aefae42cec82927a0495386c634b269306410fb20ee221539510733c
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvI4vcACgkQp5vW4rUFj5o4rQCgu+pa1Tr0FfzSJqCZ1Rb1FFIR
-KU0AnR2SJBdmH88b0HfgKgoC4fZyiNix
-=adIE
+iEYEARECAAYFAkyGKJ0ACgkQCaWpQKGI+9SDQQCeLU1OJo9rRLqqnzdqo40DdX0K
+yDYAn2fXpBbx6wIvhC/yUt1cuNEOwHuh
+=XQHU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.23-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.23-r1.ebuild
new file mode 100644
index 000000000000..474ea26befbf
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.23-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 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.23-r1.ebuild,v 1.1 2010/09/07 11:57:12 pacho Exp $
+
+EAPI=2
+inherit eutils
+
+MY_P=${P/_rc/rc}
+ALSA_DRIVER_VER="1.0.23"
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2
+	mirror://alsaproject/driver/alsa-driver-${ALSA_DRIVER_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc nls minimal"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-${PV}
+	doc? ( app-text/xmlto )"
+RDEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-${PV}
+	virtual/modutils
+	!minimal? ( sys-apps/pciutils )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if [[ -e "${ROOT}etc/modules.d/alsa" ]]; then
+		eerror "Obsolete config /etc/modules.d/alsa found."
+		die "Move /etc/modules.d/alsa to /etc/modprobe.d/alsa.conf."
+	fi
+
+	if [[ -e "${ROOT}etc/modprobe.d/alsa" ]]; then
+		eerror "Obsolete config /etc/modprobe.d/alsa found."
+		die "Move /etc/modprobe.d/alsa to /etc/modprobe.d/alsa.conf."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-modprobe.d.patch
+
+	# Exit code 99 will be the same than 0 for us per bug #299362 as suggested
+	# by upstream: http://www.spinics.net/lists/alsa-devel/msg31430.html
+	sed -i -e 's/EXIT="99"/EXIT="0"/g' alsactl/init/00main || die
+
+	# Apply upstream patches to clarify initialization
+	epatch "${FILESDIR}/${P}-alsactl-output.patch"
+	epatch "${FILESDIR}/${P}-alsactl-output2.patch"
+}
+
+src_configure() {
+	local myconf=""
+	use doc || myconf="--disable-xmlto"
+
+	econf ${myconf} \
+		$(use_enable nls)
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ${ALSA_UTILS_DOCS} || die
+
+	newbin "${WORKDIR}/alsa-driver-${ALSA_DRIVER_VER}/utils/alsa-info.sh" \
+		alsa-info
+
+	newinitd "${FILESDIR}/alsasound.initd-r4" alsasound
+	newconfd "${FILESDIR}/alsasound.confd-r3" alsasound
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf
+
+	keepdir /var/lib/alsa
+}
+
+pkg_postinst() {
+	echo
+	elog "To take advantage of the init script, and automate the process of"
+	elog "saving and restoring sound-card mixer levels you should"
+	elog "add alsasound to the boot runlevel. You can do this as"
+	elog "root like so:"
+	elog "	# rc-update add alsasound boot"
+	echo
+	elog "The script will load ALSA modules, if you choose to use a modular"
+	elog "configuration. The Gentoo ALSA developers recommend you to build"
+	elog "your audio drivers into the kernel unless the device is hotpluggable"
+	elog "or you need to supply specific options (such as model= to HD Audio)."
+	echo
+	ewarn "Automated unloading of ALSA modules is deprecated and unsupported."
+	ewarn "Should you choose to use it, bug reports will not be accepted."
+	echo
+	if use minimal; then
+		ewarn "The minimal use flag disables the dependency on pciutils that"
+		ewarn "is needed by alsaconf at runtime."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch
new file mode 100644
index 000000000000..40e76d8dd3ed
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=blobdiff_plain;f=alsactl%2Finit%2F00main;fp=alsactl%2Finit%2F00main;h=fb7f02cecabdc363bfb47ccdd6141415aa904f65;hp=2d26bbf1b8ff8f29a311e2fc4df25592e48fd3a0;hb=dcb90a779e74315596a4cdb4741983b21cba69c9;hpb=bb865dc10b6dcee9d428d3c5a17ee312e0aaf7e0
+
+diff --git a/alsactl/init/00main b/alsactl/init/00main
+index 2d26bbf..fb7f02c 100644
+--- a/alsactl/init/00main
++++ b/alsactl/init/00main
+@@ -37,7 +37,7 @@ CARDINFO{driver}=="Test", INCLUDE="test", GOTO="init_end"
+ LABEL="init_end"
+ ACCESS=="postinit", INCLUDE="postinit"
+ RESULT=="true", GOTO="00_mainend"
+-ERROR="Unknown hardware: \"$cardinfo{driver}\" \"$cardinfo{mixername}\" \"$cardinfo{components}\" \"$attr{subsystem_vendor}\" \"$attr{subsystem_device}\"\n"
++ERROR="Found hardware: \"$cardinfo{driver}\" \"$cardinfo{mixername}\" \"$cardinfo{components}\" \"$attr{subsystem_vendor}\" \"$attr{subsystem_device}\"\n"
+ ERROR="Hardware is initialized using a guess method\n"
+ INCLUDE="default"
+ EXIT="99"
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch
new file mode 100644
index 000000000000..e062c942b74b
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.23-alsactl-output2.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=blobdiff_plain;f=alsactl%2Finit%2F00main;fp=alsactl%2Finit%2F00main;h=660df389f3339688b0baabe3af1533fe5ced2647;hp=fb7f02cecabdc363bfb47ccdd6141415aa904f65;hb=7f6a55e203e2bb069c35006b605e1a19cfcd88cb;hpb=dcb90a779e74315596a4cdb4741983b21cba69c9
+
+diff --git a/alsactl/init/00main b/alsactl/init/00main
+index fb7f02c..660df38 100644
+--- a/alsactl/init/00main
++++ b/alsactl/init/00main
+@@ -38,7 +38,7 @@ LABEL="init_end"
+ ACCESS=="postinit", INCLUDE="postinit"
+ RESULT=="true", GOTO="00_mainend"
+ ERROR="Found hardware: \"$cardinfo{driver}\" \"$cardinfo{mixername}\" \"$cardinfo{components}\" \"$attr{subsystem_vendor}\" \"$attr{subsystem_device}\"\n"
+-ERROR="Hardware is initialized using a guess method\n"
++ERROR="Hardware is initialized using a generic method\n"
+ INCLUDE="default"
+ EXIT="99"
+