Fix use invocation, use use_enable when appropriate

6 files changed, 42 insertions, 40 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 716b42561fcf..f07c20af05ae 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.24 2004/05/21 18:48:52 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.25 2004/06/07 22:57:48 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> libmikmod-3.1.10-r1.ebuild,
+  libmikmod-3.1.10.ebuild, libmikmod-3.1.11-r1.ebuild,
+  libmikmod-3.1.11.ebuild:
+  Fix use invocation, use use_enable when appropriate
 
 *libmikmod-3.1.11-r1 (21 May 2004)
 
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 52c819cba55b..ebd6429023a5 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,11 +1,11 @@
-MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10 68
+MD5 686d61dbebdea370a5e0d2c58114e2db libmikmod-3.1.10.ebuild 1028
+MD5 29c4ce8b84e6300b73658a2b70cbfecf libmikmod-3.1.11-r1.ebuild 1202
+MD5 54946bf9838a44532bd06a9467a4f3e0 libmikmod-3.1.10-r1.ebuild 1112
+MD5 47115815916e373d5d63c72a484dfb18 libmikmod-3.1.11.ebuild 1087
+MD5 12461024deaeb1669a97c45a35b825f9 ChangeLog 3598
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10-r1 68
-MD5 af03c756b29b31b7868d42c0c21d1952 files/digest-libmikmod-3.1.11 68
 MD5 af03c756b29b31b7868d42c0c21d1952 files/digest-libmikmod-3.1.11-r1 68
 MD5 0624777bac2c07bc43ba979a97bd863d files/libmikmod-3.1.11-amd64-archdef.patch 490
-MD5 3b29f0643963f8479d45e2590c5e65ec ChangeLog 3383
-MD5 f1e53f40d54e0d316a8bc0496e187d39 libmikmod-3.1.10-r1.ebuild 1164
-MD5 402e1266eb1c44be016930a9ab83cb3a libmikmod-3.1.10.ebuild 1095
-MD5 14101d73874c14c4aea268f7d79e22e6 libmikmod-3.1.11.ebuild 1105
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 6f3402e554c029c5b56a2350c8184095 libmikmod-3.1.11-r1.ebuild 1220
+MD5 7f535a03cca26048f67cdf9af61100e5 files/digest-libmikmod-3.1.10 68
+MD5 af03c756b29b31b7868d42c0c21d1952 files/digest-libmikmod-3.1.11 68
diff --git a/media-libs/libmikmod/libmikmod-3.1.10-r1.ebuild b/media-libs/libmikmod/libmikmod-3.1.10-r1.ebuild
index 5b303bbc4c11..5f4a57abb3ec 100644
--- a/media-libs/libmikmod/libmikmod-3.1.10-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.10-r1.ebuild,v 1.14 2004/04/08 07:35:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.10-r1.ebuild,v 1.15 2004/06/07 22:57:48 agriffis Exp $
 
 inherit gnuconfig
 inherit flag-o-matic
@@ -20,24 +20,23 @@ LICENSE="LGPL-2.1 | LGPL-2"
 KEYWORDS="x86 amd64 hppa sparc ~mips alpha ia64"
 
 src_compile() {
-	filter-flags -Os
-
 	local myconf
-	myconf="--enable-af" # include AudioFile driver
 
-	[ -z `use esd` ]  || myconf="${myconf} --enable-esd"
-	[ -z `use alsa` ] || myconf="${myconf} --enable-alsa"
-	[ -z `use oss` ]  || myconf="${myconf} --enable-oss"
+	myconf="--enable-af" # include AudioFile driver
+	myconf="${myconf} $(use_enable esd)"
+	myconf="${myconf} $(use_enable alsa)"
+	myconf="${myconf} $(use_enable oss)"
 
 	# alpha, amd64 and ia64 (at least) need gnuconfig_update
 	gnuconfig_update
 
+	filter-flags -Os
+
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS COPYING* NEWS README TODO
diff --git a/media-libs/libmikmod/libmikmod-3.1.10.ebuild b/media-libs/libmikmod/libmikmod-3.1.10.ebuild
index 338ce5ac2f9c..22adee3f6eea 100644
--- a/media-libs/libmikmod/libmikmod-3.1.10.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.10.ebuild,v 1.20 2004/04/08 07:35:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.10.ebuild,v 1.21 2004/06/07 22:57:48 agriffis Exp $
 inherit gnuconfig
 
 IUSE="oss esd alsa"
@@ -18,23 +18,21 @@ LICENSE="LGPL-2.1 | LGPL-2"
 KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_compile() {
-
 	local myconf
-	myconf="--enable-af" # include AudioFile driver
 
-	[ -z `use esd` ]  || myconf="${myconf} --enable-esd"
-	[ -z `use alsa` ] || myconf="${myconf} --enable-alsa"
-	[ -z `use oss` ]  || myconf="${myconf} --enable-oss"
+	myconf="--enable-af" # include AudioFile driver
+	myconf="${myconf} $(use_enable esd)"
+	myconf="${myconf} $(use_enable alsa)"
+	myconf="${myconf} $(use_enable oss)"
 
-	use alpha && gnuconfig_update
-	use amd64 && gnuconfig_update
+	# needed for alpha and amd64
+	gnuconfig_update
 
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS COPYING* NEWS README TODO
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
index 2456d38576d0..ed35f20de153 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild,v 1.2 2004/05/28 15:41:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r1.ebuild,v 1.3 2004/06/07 22:57:48 agriffis Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -18,14 +18,12 @@ DEPEND=">=media-libs/audiofile-0.2.3
 	esd? ( >=media-sound/esound-0.2.19 )"
 
 src_compile() {
-	filter-flags -Os
-
 	local myconf
-	myconf="--enable-af" # include AudioFile driver
 
-	use esd && myconf="${myconf} --enable-esd"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use oss && myconf="${myconf} --enable-oss"
+	myconf="--enable-af" # include AudioFile driver
+	myconf="${myconf} $(use_enable esd)"
+	myconf="${myconf} $(use_enable alsa)"
+	myconf="${myconf} $(use_enable oss)"
 
 	# alpha, amd64 and ia64 (at least) need gnuconfig_update
 	gnuconfig_update
@@ -33,6 +31,8 @@ src_compile() {
 	# patch for 64bit arch defs for amd64/x86_64
 	use amd64 && epatch ${FILESDIR}/${P}-amd64-archdef.patch
 
+	filter-flags -Os
+
 	econf ${myconf} || die
 	emake || die
 }
diff --git a/media-libs/libmikmod/libmikmod-3.1.11.ebuild b/media-libs/libmikmod/libmikmod-3.1.11.ebuild
index 8204a393257f..5d852377b2c5 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11.ebuild,v 1.5 2004/05/14 04:09:51 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11.ebuild,v 1.6 2004/06/07 22:57:48 agriffis Exp $
 
 inherit gnuconfig flag-o-matic
 
@@ -18,18 +18,18 @@ DEPEND=">=media-libs/audiofile-0.2.3
 	esd? ( >=media-sound/esound-0.2.19 )"
 
 src_compile() {
-	filter-flags -Os
-
 	local myconf
-	myconf="--enable-af" # include AudioFile driver
 
-	use esd && myconf="${myconf} --enable-esd"
-	use alsa && myconf="${myconf} --enable-alsa"
-	use oss && myconf="${myconf} --enable-oss"
+	myconf="--enable-af" # include AudioFile driver
+	myconf="${myconf} $(use_enable esd)"
+	myconf="${myconf} $(use_enable alsa)"
+	myconf="${myconf} $(use_enable oss)"
 
 	# alpha, amd64 and ia64 (at least) need gnuconfig_update
 	gnuconfig_update
 
+	filter-flags -Os
+
 	econf ${myconf} || die
 	emake || die
 }