Drop midi use flag, bug 272659

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

5 files changed, 12 insertions, 127 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index f952c3809d99..142671918ff5 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.269 2009/07/31 21:49:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.270 2009/08/01 14:48:34 beandog Exp $
+
+  01 Aug 2009; Steve Dibb <beandog@gentoo.org> alsa-utils-1.0.17.ebuild,
+  alsa-utils-1.0.19-r2.ebuild, -alsa-utils-1.0.20.ebuild:
+  Drop midi use flag, bug 272659
 
 *alsa-utils-1.0.20-r2 (31 Jul 2009)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 1096c7c55873..9e9c5f6ed290 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -15,9 +15,8 @@ AUX alsasound.initd-r3 6196 RMD160 dc9592ccb23d3707a0269554beb5a35cfdfe6ec2 SHA1
 DIST alsa-utils-1.0.17.tar.bz2 1016532 RMD160 6dbc55ffab43a6552bc5032099a071101be467ab SHA1 e71f752b79357fd8ad1c86e4e926cbce19de19d3 SHA256 6a06f457d66eca75ac1ab065e64539e4ccf22ed4e53703a70194cb85203b3125
 DIST alsa-utils-1.0.19.tar.bz2 1040697 RMD160 4334c151fb2881aa773297cfc87dd6ddc4f0c7d6 SHA1 7a84764e126188e1951f1db96c5153ba03397541 SHA256 1f4924f5ae7857ce64a3d6ecbeb98133c74ff1ead2b0f48187623d6e4b838cad
 DIST alsa-utils-1.0.20.tar.bz2 1044483 RMD160 f8e8f036caa2a687c2768b19fddb4c973aafe152 SHA1 14364394d1eaff5b5719c6be834de1311c83475e SHA256 07f08286b3860f60d1794cc0de4407a53adcd4b6f065531d6dcef02b0c56a0cf
-EBUILD alsa-utils-1.0.17.ebuild 2706 RMD160 20d6842132420c8b4907d8a96d8b10340c4145c2 SHA1 5cccb872b53dbfe7e473a263859b985aa306144a SHA256 1fad0877f5c8836695fefc6d7d1faf3fb9dcdda2a3e94a9f4f4faed24853167f
-EBUILD alsa-utils-1.0.19-r2.ebuild 2980 RMD160 086862e076bf5a0176d8b1f19f1e82101b0bfe87 SHA1 d122d7e4cedebcc83fc1338f2e6e87637d831bf4 SHA256 0481750ea81359398bb91310c8ecdae94fb2c58f185516c3cd1073ff3a57d223
+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-r2.ebuild 2639 RMD160 11fcd42796f8a342088a3242d8174879a2d12036 SHA1 bc3b0b1c315f9856ef1728c2c9394c8530116102 SHA256 20c4f82ecb6ab7614bfbede89dafb42953b2c889d58a64a869d24ea0487cfd70
-EBUILD alsa-utils-1.0.20.ebuild 2983 RMD160 a6b7572e2fd40cb87cc0f0dd8c4b07a73d28d045 SHA1 7a3b8f0f7ce849b23fcb692457a0f5ce07a3bdbb SHA256 ebcfb4522a126cbc7f43d132b40aa00fc135098edf2dbb70553d0e273d554a91
-MISC ChangeLog 40879 RMD160 7aa1e6a81d3af7fcd0592e5ee979f6b8aa21da3f SHA1 dad595fdf5e07ca2104ef3018b48adab54a5b339 SHA256 0cddcd66418b79a4cfaad453ae7deaca459fbd3e947e7cc2460d4c3ce3149773
+MISC ChangeLog 41044 RMD160 16e1541f12b419781c719ae02b57375cc94838e5 SHA1 229a7b75f03a2c20daf496a9d36ad96d06c0569f SHA256 082645fefb68ea53cc7fd37f7c9c21919305d3ae5decd6d049be71891d1da17f
 MISC metadata.xml 313 RMD160 268cddbeb91eb55d326ff5736fe51e704b22db82 SHA1 2a144ccf9aa1c3789e7b25cd0e9083c5ce345b67 SHA256 4777a7e011441b62b0e6db0b35035fa99d36a0657aac31f406c7cbeaef906801
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.17.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.17.ebuild
index eb01b35021f2..3b710f4fccfc 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.17.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.17.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.17.ebuild,v 1.11 2009/05/07 00:00:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.17.ebuild,v 1.12 2009/08/01 14:48:34 beandog Exp $
 
 inherit eutils autotools
 
@@ -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"
-IUSE="nls midi minimal"
+IUSE="nls minimal"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-util/dialog
@@ -24,15 +24,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror ""
-		eerror "To be able to build alsa-utils with midi support you need"
-		eerror "to have built media-libs/alsa-lib with midi USE flag."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -47,7 +38,6 @@ src_unpack() {
 
 src_compile() {
 	econf $(use_enable nls) \
-		$(use_enable midi sequencer) \
 		|| die "configure failed"
 
 	emake || die "make failed"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild
index b6f4cfd534da..8f708d32dcaf 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.19-r2.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.19-r2.ebuild,v 1.8 2009/07/02 19:18:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.19-r2.ebuild,v 1.9 2009/08/01 14:48:34 beandog Exp $
 
 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"
-IUSE="doc nls midi minimal"
+IUSE="doc nls minimal"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-util/dialog
@@ -27,15 +27,6 @@ RDEPEND=">=sys-libs/ncurses-5.1
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror ""
-		eerror "To be able to build alsa-utils with midi support you need"
-		eerror "to have built media-libs/alsa-lib with midi USE flag."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
 src_compile() {
 
 	local myconf=""
@@ -43,7 +34,6 @@ src_compile() {
 
 	econf ${myconf} \
 		$(use_enable nls) \
-		$(use_enable midi sequencer) \
 		|| die "configure failed"
 
 	emake || die "make failed"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.20.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.20.ebuild
deleted file mode 100644
index 455893dd0b75..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.20.ebuild
+++ /dev/null
@@ -1,98 +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.ebuild,v 1.2 2009/05/07 00:00:27 vapier Exp $
-
-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 midi 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 use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror ""
-		eerror "To be able to build alsa-utils with midi support you need"
-		eerror "to have built media-libs/alsa-lib with midi USE flag."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_compile() {
-
-	local myconf=""
-	use doc || myconf="--disable-xmlto"
-
-	econf ${myconf} \
-		$(use_enable nls) \
-		$(use_enable midi sequencer) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-pkg_preinst() {
-	if [[ -a /etc/modules.d/alsa ]] && [[ ! -a /etc/modprobe.d/alsa ]]; then
-		elog "Moving old alsa configuration in modules.d to new"
-		elog "location in modprobe.d in /etc/"
-		mv "${ROOT}/etc/modules.d/alsa" "${ROOT}/etc/modprobe.d/alsa"
-	fi
-}
-
-src_install() {
-	local ALSA_UTILS_DOCS="ChangeLog README TODO
-		seq/aconnect/README.aconnect
-		seq/aseqnet/README.aseqnet"
-
-	emake DESTDIR="${D}" install || die "Installation Failed"
-
-	dodoc ${ALSA_UTILS_DOCS} || die
-	newdoc alsamixer/README README.alsamixer || die
-
-	newinitd "${FILESDIR}/alsasound-1.0.19-r1.initd" alsasound
-	newconfd "${FILESDIR}/alsasound-1.0.19.confd" 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
-}