Move KEYWORDS to -r5 since it only fixed off-by-one in default init file. Remove useless -r4.

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

4 files changed, 9 insertions, 99 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index fb30604b5c01..09cb30812812 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.277 2009/08/17 19:35:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.278 2009/08/21 16:10:57 ssuominen Exp $
+
+  21 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  alsa-utils-1.0.20-r5.ebuild:
+  Move KEYWORDS to -r5 since it only fixed off-by-one in default init file.
 
 *alsa-utils-1.0.20-r5 (17 Aug 2009)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index a0adb9e789d3..b959e94612ad 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -16,7 +16,6 @@ DIST alsa-utils-1.0.19.tar.bz2 1040697 RMD160 4334c151fb2881aa773297cfc87dd6ddc4
 DIST alsa-utils-1.0.20.tar.bz2 1044483 RMD160 f8e8f036caa2a687c2768b19fddb4c973aafe152 SHA1 14364394d1eaff5b5719c6be834de1311c83475e SHA256 07f08286b3860f60d1794cc0de4407a53adcd4b6f065531d6dcef02b0c56a0cf
 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
-EBUILD alsa-utils-1.0.20-r5.ebuild 2788 RMD160 d6557aa18f03df514de196b6672b6451fbec91f7 SHA1 6e0a0ee5681574d7518216430756da5c055fe7de SHA256 1ca82b124d253c6e5fa5fd330e7d3d3d8b8089be2781dc27d6badc9091eddfa8
-MISC ChangeLog 42334 RMD160 433a990b0c3850c7f2861f310a7a48bc126ea66d SHA1 0e0cea5eadde3c6a31357afc35ab2c7d1af846dc SHA256 0c693bf5931455129ec6e6248edc9607f43960994d9784bc5ee64c65a26bfd6b
+EBUILD alsa-utils-1.0.20-r5.ebuild 2784 RMD160 e446d56890e3eacac39324ff682b0b3a443b5f3c SHA1 ed7e391a25e3af121448f83a854aa9c2b8fc9eb1 SHA256 baf013ec3fbe9642e941fc245fa195924edd4d6abe7f71319d017851d47a4014
+MISC ChangeLog 42496 RMD160 3435128f6ab97d1e0fe0a9b51626bc33f0271b93 SHA1 be43e0128d3880e1dc35bd1fdce96d90b23e6293 SHA256 3748bfc9292868b7d7e53ea897a53b24e3cd9f208a6779f5a4f7afe472df0bd2
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.20-r4.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.20-r4.ebuild
deleted file mode 100644
index 4915ca0912b2..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.20-r4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-r4.ebuild,v 1.5 2009/08/17 05:03:10 jer 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
-}
-
-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/alsa-utils-1.0.20-r5.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild
index d74a74e33c40..41f149fea9b9 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.20-r5.ebuild,v 1.2 2009/08/21 16:10:57 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86"
 IUSE="doc nls minimal"
 
 DEPEND=">=sys-libs/ncurses-5.1