Make sure that the minimal USE flag also does not install the alsaconf script, not just ignore the dependency.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 94 insertions, 6 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 36cd46b90012..8bbf817a6c09 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.322 2012/04/01 15:13:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.323 2012/04/08 19:43:31 flameeyes Exp $
+
+*alsa-utils-1.0.25-r2 (08 Apr 2012)
+
+  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +alsa-utils-1.0.25-r2.ebuild:
+  Make sure that the minimal USE flag also does not install the alsaconf script,
+  not just ignore the dependency.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> alsa-utils-1.0.25-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #406101
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 460fff7fe812..9575332b1ac2 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -19,13 +19,14 @@ DIST alsa-utils-1.0.25.tar.bz2 1132780 RMD160 8b1dc5c28d1fa6d9e0a79e029b6d69530f
 EBUILD alsa-utils-1.0.23-r1.ebuild 3210 RMD160 bd961bc5590b87990c87850550001fb6f805530c SHA1 fd4d31c7e2062b0fa4bbd9c83eadc5a301fdd02a SHA256 0dd8fb6adff11d18696e1d7fa7dd9f02a6d65f7337996b177cab1d916cc90c31
 EBUILD alsa-utils-1.0.24.2-r1.ebuild 2891 RMD160 6d9140742ac014fcede63dc50906b30de1f39328 SHA1 de545afa552811f631e866e9b9eb858aefa94dd2 SHA256 35b824183a1a03c77359440a8ae4527cd05859a1814df39e539cd325aace09c7
 EBUILD alsa-utils-1.0.25-r1.ebuild 2225 RMD160 fe5eae6e1be19f62e9144ceb49bcfd78a4cf89a4 SHA1 91668240fc709a0c71a8fdb86e88a0bd7a78c75a SHA256 ee216f54425e5c5fda41047dc13169be8f19eeab12d2924dfff7a18079ba94d5
+EBUILD alsa-utils-1.0.25-r2.ebuild 2272 RMD160 82d1a3169db7f1379f33dc1e650d73613a052cfe SHA1 a7cb409d6ccc6282ed6c783aa3a2631ad2fa97fd SHA256 50836367ac87f984a6e1ae2c337f15adb9cb4a808a158ca6f141fc0ca47e7cc6
 EBUILD alsa-utils-1.0.25.ebuild 2839 RMD160 86a86e89911e2ceb0a0626602d0db26b82959030 SHA1 a0e1b0666dc6f01a0f759ddc07913aa4ab3c11e7 SHA256 4e2795d7e943c11eaa64b823781079385a35770e25177ff9519d415216249152
-MISC ChangeLog 49203 RMD160 576748edc87bd539d54728bee285fa001c8c257f SHA1 11f3a8490a235412481f0f492f028afec41cdd85 SHA256 6989d15fb6aebb58596a9569367ebcb05924b1cb1b65b5f0e6507acba277c368
+MISC ChangeLog 49446 RMD160 6602f3911fa6c254b4a3c9ce5e061cc3ea920bae SHA1 7a998887a4c4160a593b29f70903469c115e9914 SHA256 0df76e0f1f7645d25d3d34231cb71bbebf4bc6b90bfe41c8ed4fde5b50d17c29
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94cJMACgkQuQc30/atMkAExACfUXMP805rLqYPJOptAhqBcbEU
-924An3mjaFQSPP3s70i0Zl0tWhGmSYZy
-=8Rst
+iEYEARECAAYFAk+B6mUACgkQAiZjviIA2Xi9hACdG3xxCNti78/CV6zAEYwQG/tY
+pLgAoLqkWaEC4UY2SqpuTjK5URFVfecG
+=ix8i
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.25-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.25-r2.ebuild
new file mode 100644
index 000000000000..ff70debc7196
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.25-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 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.25-r2.ebuild,v 1.1 2012/04/08 19:43:31 flameeyes Exp $
+
+EAPI=4
+inherit base systemd
+
+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
+	mirror://alsaproject/driver/alsa-driver-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc nls minimal"
+
+COMMON_DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.25
+	media-libs/libsamplerate"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( sys-apps/pciutils )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+"${FILESDIR}/${PN}-1.0.23-modprobe.d.patch"
+"${FILESDIR}/${P}-separate-usr-var-fs.patch"
+)
+
+src_configure() {
+	local myconf=""
+	use doc || myconf="--disable-xmlto"
+
+	econf ${myconf} \
+		$(use_enable nls) \
+		$(use_enable !minimal alsaconf) \
+		"$(systemd_with_unitdir)"
+}
+
+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-${PV}/utils/alsa-info.sh" \
+		alsa-info
+
+	newinitd "${FILESDIR}/alsasound.initd-r5" alsasound
+	newconfd "${FILESDIR}/alsasound.confd-r4" 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
+	ewarn "The ALSA core should be built into the kernel or loaded through other"
+	ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	echo
+	if use minimal; then
+		ewarn "The minimal use flag disables the dependency on pciutils that"
+		ewarn "is needed by alsaconf at runtime."
+	fi
+}