Remove built_with_use check for media-libs/alsa-lib[midi].

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

3 files changed, 27 insertions, 39 deletions

diff --git a/media-sound/amsynth/ChangeLog b/media-sound/amsynth/ChangeLog
index eddcf6b4aa65..f57879655f93 100644
--- a/media-sound/amsynth/ChangeLog
+++ b/media-sound/amsynth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/amsynth
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.31 2008/04/29 14:28:18 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/ChangeLog,v 1.32 2009/08/01 06:21:29 ssuominen Exp $
+
+  01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> amsynth-1.2.0.ebuild:
+  Remove built_with_use check for media-libs/alsa-lib[midi].
 
   29 Apr 2008; Raúl Porcel <armin76@gentoo.org> amsynth-1.2.0.ebuild:
   sparc stable wrt #218622
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index e0da095f2614..64a9838cd1c7 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -3,6 +3,6 @@ AUX amsynth-1.2.0-asneeded.patch 1326 RMD160 b162bafcca8924540960c1b85c6080f19bd
 AUX amsynth-1.2.0-cflags.patch 542 RMD160 9725b28818b7cc6c7d4090ba1aea2dadecd5d1e7 SHA1 4725f56e6e946623fa9e043a481a8e4c54fb360e SHA256 463c6f9df0084d398e37783d25e95340ce3029660e221f68842b06aef08e3a5d
 AUX amsynth-1.2.0-debug.patch 1526 RMD160 85303509b7e400b892cf4b29ef54e1125908861a SHA1 d8909b260396771c78fe1ab4e351375eb4001698 SHA256 87c5de38991eae846f8c202e649d5cfc05c69daae1c2b6e8b88ace2ca66d13b5
 DIST amSynth-1.2.0.tar.gz 616311 RMD160 b24b493e1532f3b1ad574856cfaadf8418e32900 SHA1 3e92417f6898f24a0996fef45827937fbf28e9ef SHA256 5fff8dc65bd5550bbf408e3df1123c68e31517bbb7441cbe0b964ab271948b1c
-EBUILD amsynth-1.2.0.ebuild 1827 RMD160 05214693e2ef7a265da4dfdbe927fbfb63cd87e7 SHA1 15386ce7c936eb73f26b664c6b820e7054792374 SHA256 b19a62fa3bbac9ac15dd84a63a1e0a2de616d35011e8a7f0c34067ba7fadbcd1
-MISC ChangeLog 4256 RMD160 b1f3d618063a8945a7559f896199bc20b5bef27e SHA1 9fc53b2d266e7778e9dff13c1550937c47ccb02a SHA256 5987b5b528bd82b8c3153bc8b2580de208908116f6ac7dd7879b822fda0b6cc3
+EBUILD amsynth-1.2.0.ebuild 1463 RMD160 4c9b1c01936a9d242a001da4860435ee24ae8009 SHA1 3d8a9e432f2dabef9cea7f176eab4131e811e0ce SHA256 6c939a3409bc74736b1a51c30532ae1e2d122de19a9c6db1a37682d1a1b7d279
+MISC ChangeLog 4396 RMD160 383874eddc823f728d82801abdb0c948fe23d59c SHA1 5fdfda75393a3f1b36956e6791b375dda9041d36 SHA256 ae99cf64478b8a6233a2b423b0714ed5b1d00c7dd220df9e0d9bfc111057554f
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/amsynth/amsynth-1.2.0.ebuild b/media-sound/amsynth/amsynth-1.2.0.ebuild
index 79ba6a30d702..2e34674304b9 100644
--- a/media-sound/amsynth/amsynth-1.2.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.2.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.0.ebuild,v 1.8 2008/04/29 14:28:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amsynth/amsynth-1.2.0.ebuild,v 1.9 2009/08/01 06:21:29 ssuominen Exp $
 
-IUSE="debug alsa jack sndfile oss"
-
-inherit eutils autotools
+EAPI=2
+inherit autotools eutils
 
 MY_P=${P/_rc/-rc}
 MY_P=${MY_P/amsynth/amSynth}
@@ -16,6 +15,7 @@ SRC_URI="mirror://sourceforge/amsynthe/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="alsa debug jack oss sndfile"
 
 RDEPEND=">=dev-cpp/gtkmm-2.4
 	sndfile? ( >=media-libs/libsndfile-1.0 )
@@ -24,50 +24,35 @@ RDEPEND=">=dev-cpp/gtkmm-2.4
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror ""
-		eerror "To be able to build amSynth with ALSA 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}"
+S=${WORKDIR}/${MY_P}
 
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-	epatch "${FILESDIR}/${P}-debug.patch"
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-debug.patch
+	epatch "${FILESDIR}"/${P}+gcc-4.3.patch
 	eautoreconf
 }
 
-src_compile() {
-	econf $(use_with oss) \
+src_configure() {
+	econf \
+		$(use_with oss) \
 		$(use_with alsa) \
 		$(use_with jack) \
 		$(use_with sndfile) \
-		$(use_enable debug) \
-		|| die "configure failed"
-	emake || die
+		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS README
 }
 
 pkg_postinst() {
 	elog
-	elog "amSynth has been installed normally."
-	elog "If you would like to use the virtual"
-	elog "keyboard option, then do"
-	elog "emerge vkeybd"
-	elog "and make sure you emerged amSynth"
-	elog "with alsa support (USE=alsa)"
+	elog "amSynth has been installed normally. If you would like to use"
+	elog "the virtual keyboard option, then do:"
+	elog "# emerge vkeybd"
+	elog "and make sure you emerged amSynth with alsa support (USE=alsa)"
 	elog
 }