Fix brackets inside /usr/share/alsa/init/default wrt #281538.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 116 insertions, 2 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index deee9321b411..fb30604b5c01 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.276 2009/08/17 05:03:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.277 2009/08/17 19:35:50 ssuominen Exp $
+
+*alsa-utils-1.0.20-r5 (17 Aug 2009)
+
+  17 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +alsa-utils-1.0.20-r5.ebuild, +files/alsa-utils-1.0.20-init_default.patch:
+  Fix brackets inside /usr/share/alsa/init/default wrt #281538.
 
   17 Aug 2009; Jeroen Roovers <jer@gentoo.org> alsa-utils-1.0.20-r4.ebuild:
   Stable for HPPA (bug #280464).
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 22e93f9a5388..a73616917c0a 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -3,6 +3,7 @@ AUX alsa-utils-1.0.11_rc2-nls.patch 1212 RMD160 a83b1c634b5dd589cc0b119329453576
 AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 1283 RMD160 9bd58de0ab10c6ea8a7b310759b5b99c80681bf4 SHA1 cf3cd67c492e5c69e78e34c6a8fdfebdd84639df SHA256 8a28d91e9b6092c5f71a45bf40a9dc710fa1f305ee0738d16070eedfcb480511
 AUX alsa-utils-1.0.14-alsaconf-modules-update.patch 1337 RMD160 9910bf0845f279609c7249fd344da1a2278c071e SHA1 fe06f65b32a84f48d6589aa3c1a691a081c7a48c SHA256 5c91313683a66b4b023a1fce15bb2c00228f945bcaeaa3d668892a59098475b3
 AUX alsa-utils-1.0.17-seq.patch 1633 RMD160 8363501d3b7a52d95105cf43cb2b9cccf380f112 SHA1 29a69aa7bd8cc08a1d369ff0e16700d5c613a86e SHA256 a9c2df9b16c9907c4388513739db939ffe31a49b61e3c5d93b4b8c1bf3038e78
+AUX alsa-utils-1.0.20-init_default.patch 811 RMD160 851dcc7c4b17ae703adc5e1eb82c1ee839d3a3e1 SHA1 8171fc924abdb2a1179d56d2100b5474ddcfd35d SHA256 f10e23e5f8cdb29039cabef9a97804db81841bee245bc632ee9940516640cf1d
 AUX alsa-utils-1.0.20-modprobe.d.patch 501 RMD160 4b2aa8676fc23b029a66e8a699be5f811c7c932c SHA1 4598144173d13e02be8727e17098c4b0c8fa8bc6 SHA256 f7d3a49f26995118d22c2c06383da59a649030a938dd25911ac074f5bb7a1c3d
 AUX alsasound-1.0.10_rc2 7183 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c SHA1 70260ad940df48464a4089f014b73956a690eb3e SHA256 f9f51f35e0fafb87ac9d5f2b48835142e34bcaecc30eb28c92e2af6b16d4c083
 AUX alsasound-1.0.19-r1.initd 6868 RMD160 9e7e9ac4a2c2e98def8c1e5498bb6631fd269a9d SHA1 c5a716afde0da422d7d3a3160f5a21024f7ea660 SHA256 b9d53242b7aae9b6517677b65ff4d9412fb347769adc8f9efb7d902b28731130
@@ -20,5 +21,6 @@ DIST alsa-utils-1.0.20.tar.bz2 1044483 RMD160 f8e8f036caa2a687c2768b19fddb4c973a
 EBUILD alsa-utils-1.0.17.ebuild 2370 RMD160 bc00bdcbcb81cd9f09e62bfffc10f557a953bd32 SHA1 a77ec0421c845d32f85e5d1434c450e2f6bc3d88 SHA256 705e05b8aa3bff1fab0389c505d3a6f2f8377167f65b65f6935d3ab2a53a32ba
 EBUILD alsa-utils-1.0.19-r2.ebuild 2644 RMD160 72373a4a4b98a16ddbcd796c0dde96c9091a05cb SHA1 ddbfc63ba4ff40eb83209e283da1acb01b5722c8 SHA256 fa2ef7d7646155d2d5283f1b826136b61a94585b8ebe3240e4bad0f018c446ed
 EBUILD alsa-utils-1.0.20-r4.ebuild 2736 RMD160 005419f8e0125db393bb5425826c98c68d39f4b3 SHA1 4f3c2a72c5ce741a44ae9c8b73499e9ed5006cc9 SHA256 a6d246d316fea9f1a2709ff5bbb0d05221655d2f3f5b333266708ffe98053d62
-MISC ChangeLog 42095 RMD160 26f45d006db978a79ecf5f40d90d3af1541f6186 SHA1 a1875ade0f76f04eea69dfc07d82e36ebd454340 SHA256 33fd8bfe0acaf0220fc411a8f3c1d7011dd46909aa39a27eec7abd148646ca26
+EBUILD alsa-utils-1.0.20-r5.ebuild 2788 RMD160 d6557aa18f03df514de196b6672b6451fbec91f7 SHA1 6e0a0ee5681574d7518216430756da5c055fe7de SHA256 1ca82b124d253c6e5fa5fd330e7d3d3d8b8089be2781dc27d6badc9091eddfa8
+MISC ChangeLog 42334 RMD160 433a990b0c3850c7f2861f310a7a48bc126ea66d SHA1 0e0cea5eadde3c6a31357afc35ab2c7d1af846dc SHA256 0c693bf5931455129ec6e6248edc9607f43960994d9784bc5ee64c65a26bfd6b
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild
new file mode 100644
index 000000000000..d74a74e33c40
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 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.20-r5.ebuild,v 1.1 2009/08/17 19:35:50 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+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 ~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 \
+		"${FILESDIR}"/${P}-init_default.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
+	newdoc alsamixer/README README.alsamixer || die
+
+	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.20-init_default.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.20-init_default.patch
new file mode 100644
index 000000000000..7671ee8f7d45
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.20-init_default.patch
@@ -0,0 +1,12 @@
+diff -ur alsa-utils-1.0.20.orig/alsactl/init/default alsa-utils-1.0.20/alsactl/init/default
+--- alsa-utils-1.0.20.orig/alsactl/init/default	2009-05-06 10:07:24.000000000 +0300
++++ alsa-utils-1.0.20/alsactl/init/default	2009-08-17 22:29:46.000000000 +0300
+@@ -49,7 +49,7 @@
+ CTL{name}="Headphone Playback Volume",PROGRAM=="__ctl_search",GOTO="headphone0_end"
+ # if master volume control is present, turn headphone volume to max
+ ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
+-ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
++ENV{has_pmaster_vol}=="true",CTL{values}="100%",GOTO="headphone0_end"
+ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
+ LABEL="headphone0_end"
+ CTL{name}="Headphone Playback Switch",PROGRAM=="__ctl_search", \