Drop midi use flag, bug 272659

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

6 files changed, 24 insertions, 116 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 63a1a287580b..5b60a6d468bc 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.283 2009/07/02 19:15:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.284 2009/08/01 14:44:02 beandog Exp $
+
+  01 Aug 2009; Steve Dibb <beandog@gentoo.org> alsa-lib-1.0.17a.ebuild,
+  alsa-lib-1.0.19.ebuild, -alsa-lib-1.0.20.ebuild,
+  alsa-lib-1.0.20-r1.ebuild:
+  Drop midi use flag, bug 272659
 
   02 Jul 2009; Markus Meier <maekke@gentoo.org> alsa-lib-1.0.19.ebuild:
   amd64 stable, bug #272682
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index f8ce564f9fc8..5f745feef8c2 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -6,9 +6,8 @@ AUX alsa-lib-1.0.17-sframe-type.patch 1532 RMD160 367a8a22f6995b3f35e1d4c4658020
 DIST alsa-lib-1.0.17a.tar.bz2 789428 RMD160 ff4c8478bbc421225628419e4ffcb10be47c7826 SHA1 b79a6ee7040a59df5b5c066aced517881495fa87 SHA256 ace3d9c57eae65c7f292704b49c3806a1f90ce2cdeb4aca1e5abf021127ad3ed
 DIST alsa-lib-1.0.19.tar.bz2 792682 RMD160 0ba7f8b1bd311fd9adc7cb1f80e2d3b23b1b303a SHA1 d1e320cad0ef902db2417de1c3520fc19af0af32 SHA256 32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886
 DIST alsa-lib-1.0.20.tar.bz2 794728 RMD160 8e0b48367abdd9d5746d2dc537014b1449e65e05 SHA1 0e6acce4301a4b3924e268a78e8c979a55cc8f88 SHA256 15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
-EBUILD alsa-lib-1.0.17a.ebuild 2862 RMD160 5910e4b784c4a2d30f2a57f06bc49540fae7a86d SHA1 1bde7ad3e00e1f227fb7540acaa10b51006d2d1d SHA256 2e212bb70720ae6266d3be9e3b5d9365602b5a1e18fd85b65f8c39b0b4d3d7ae
-EBUILD alsa-lib-1.0.19.ebuild 2864 RMD160 ff0821dd54496164cc7479963849a99a772d95a8 SHA1 46fdf66996ec7bce736a2880e31c11ed90686b44 SHA256 781f65342f99f244cc0566a34d1ea1b71ccdaf39c93643ef878c42e7938e0d69
-EBUILD alsa-lib-1.0.20-r1.ebuild 2782 RMD160 b395b86cc16f67eb8034f54e44b7be7557f2ee12 SHA1 63fcdffd406afce8f9987764af96bb44855b0fb3 SHA256 f5281e4e1108ba67c4d56df4147824991667b5d509e7038cfd2af75e25b2e982
-EBUILD alsa-lib-1.0.20.ebuild 2871 RMD160 a07d0f4c8ad0fd509643f80ca30fc705b7197b90 SHA1 e18f8f31e2ee25ade4b10b569eb90685a2f530ff SHA256 4e99131752b327422cc554d4fb9d8d4fa9a7c30781bf836543ad87af8a813919
-MISC ChangeLog 41851 RMD160 c609af1342f348313d1554047c93e985aaa134f3 SHA1 f0b89fc424177333ec0f0184b8062194e396d34a SHA256 d6cf393bc79862326a002ed47a1efa7bdd5f382beb608d3cb157c4d37fa8f15a
+EBUILD alsa-lib-1.0.17a.ebuild 2827 RMD160 5a19648fd0afc59c00d6d8e6253de5e29b3b06c9 SHA1 5bcf05da779f739120b77723b4cea4d7ab1f8f33 SHA256 870a0173921b827e3c018366b246e86de282d1570811f4a4ca89ed84f4bc09e6
+EBUILD alsa-lib-1.0.19.ebuild 2830 RMD160 ec70f6b035af4fcfebcd68e82793706585e48a59 SHA1 b3920bad6809444bfef052df3fb51f1b612e065d SHA256 a934b24abe06f127bff7261403b39176c2f7cae25ff025e08efcaa3b893a2aaa
+EBUILD alsa-lib-1.0.20-r1.ebuild 2839 RMD160 1d8a1a2c16b0f93c90404f6ff4209a11f01d47f4 SHA1 961ed182c41b5115df20446e30d5f25d886cc155 SHA256 da22222ba172f445ba096f403b13948155299ac13a9637d926ec22931cb1e305
+MISC ChangeLog 42038 RMD160 1ddbd8d8a8e7c25f1e429763e02892bdbde8d154 SHA1 a09a59d3c2a298f94611ade084f969c2dcb35198 SHA256 ccd93f1f61c2585b7625a13749bee6b65e0e0342190dec2fb25412a2fa6dd2fc
 MISC metadata.xml 435 RMD160 677502d2793c817b02c1c09f5413e6f672f5f245 SHA1 ab8e94692cb97938014d3d054c8af7098a4eb46a SHA256 59a108b215b33d04312fe9ace912de59b2b5101400c1e57bcc37d5fde8862e3b
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.17a.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.17a.ebuild
index 69c0574f4c3e..61c567d2e109 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.17a.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.17a.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-libs/alsa-lib/alsa-lib-1.0.17a.ebuild,v 1.10 2009/03/31 09:31:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.17a.ebuild,v 1.11 2009/08/01 14:44:02 beandog Exp $
 
 inherit eutils libtool
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="doc debug alisp midi python"
+IUSE="doc debug alisp python"
 
 RDEPEND="python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
@@ -57,12 +57,12 @@ src_compile() {
 		--enable-static \
 		--enable-shared \
 		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
 		$(use_with debug) \
 		$(use_enable alisp) \
 		$(use_enable python) \
-		$(use_enable midi rawmidi) \
-		$(use_enable midi seq) \
-		$(use_enable midi aload) \
 		--with-pcm-plugins="${ALSA_PCM_PLUGINS}" \
 		--disable-dependency-tracking \
 		${myconf} \
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.19.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.19.ebuild
index b36069472969..43adc5a54422 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.19.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.19.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-libs/alsa-lib/alsa-lib-1.0.19.ebuild,v 1.7 2009/07/02 19:15:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.19.ebuild,v 1.8 2009/08/01 14:44:02 beandog Exp $
 
 inherit eutils libtool
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86"
-IUSE="doc debug alisp midi python"
+IUSE="doc debug alisp python"
 
 RDEPEND="python? ( dev-lang/python )"
 DEPEND="${RDEPEND}
@@ -57,12 +57,12 @@ src_compile() {
 		--enable-static \
 		--enable-shared \
 		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
 		$(use_with debug) \
 		$(use_enable alisp) \
 		$(use_enable python) \
-		$(use_enable midi rawmidi) \
-		$(use_enable midi seq) \
-		$(use_enable midi aload) \
 		--with-pcm-plugins="${ALSA_PCM_PLUGINS}" \
 		--disable-dependency-tracking \
 		${myconf} \
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.20-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.20-r1.ebuild
index 07db20731e65..fe037f8387ae 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.20-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.20-r1.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-libs/alsa-lib/alsa-lib-1.0.20-r1.ebuild,v 1.1 2009/06/04 18:02:13 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.20-r1.ebuild,v 1.2 2009/08/01 14:44:02 beandog Exp $
 
 inherit eutils libtool
 
@@ -57,6 +57,9 @@ src_compile() {
 		--enable-static \
 		--enable-shared \
 		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
 		$(use_with debug) \
 		$(use_enable alisp) \
 		$(use_enable python) \
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.20.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.20.ebuild
deleted file mode 100644
index 861549b1ccc9..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.20.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.20.ebuild,v 1.1 2009/05/06 17:49:25 beandog Exp $
-
-inherit eutils libtool
-
-MY_P="${P/_rc/rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc debug alisp midi python"
-
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	>=media-sound/alsa-headers-${PV}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-IUSE_PCM_PLUGIN="copy linear route mulaw alaw adpcm rate plug multi shm file
-null empty share meter mmap_emul hooks lfloat ladspa dmix dshare dsnoop asym iec958
-softvol extplug ioplug"
-
-for plugin in ${IUSE_PCM_PLUGIN}; do
-	IUSE="${IUSE} alsa_pcm_plugins_${plugin}"
-done
-
-pkg_setup() {
-	if [ -z "${ALSA_PCM_PLUGINS}" ] ; then
-		ewarn "You haven't selected _any_ PCM plugins. Either you set it to something like the default"
-		ewarn "(which is being set in the profile UNLESS you unset them) or alsa based applications"
-		ewarn "are going to *misbehave* !"
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	elibtoolize
-	epunt_cxx
-}
-
-src_compile() {
-	local myconf
-	use elibc_uclibc && myconf="--without-versioned"
-
-	# needed to avoid gcc looping internaly
-	use hppa && export CFLAGS="-O1 -pipe"
-
-	econf \
-		--enable-static \
-		--enable-shared \
-		--disable-resmgr \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		$(use_enable python) \
-		$(use_enable midi rawmidi) \
-		$(use_enable midi seq) \
-		$(use_enable midi aload) \
-		--with-pcm-plugins="${ALSA_PCM_PLUGINS}" \
-		--disable-dependency-tracking \
-		${myconf} \
-		|| die "configure failed"
-
-	emake || die "make failed"
-
-	if use doc; then
-		emake doc || die "failed to generate docs"
-		fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ChangeLog TODO || die
-	use doc && dohtml -r doc/doxygen/html/*
-}
-
-pkg_postinst() {
-	ewarn "Starting from alsa 1.0.11_rc3 the configuration for dmix is changed."
-	ewarn "Leaving around old asound.conf or ~/.asoundrc might make all apps"
-	ewarn "using ALSA output crash."
-	ewarn "Note that dmix output is enabled by default on the 'default' device"
-	ewarn "since ALSA 1.0.9."
-	elog ""
-	elog "Please try in-kernel ALSA drivers instead of the alsa-drivers ebuild."
-	elog "If alsa-drivers works for you where a *recent* kernel does not, we want "
-	elog "to know about this. Our e-mail address is alsa-bugs@gentoo.org"
-	elog "However, if you notice no sound output or instability, please try to "
-	elog "upgrade your kernel to a newer version first."
-}