Drop midi use flag, bug 272659

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 9 insertions, 123 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/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
-}