Added IUSE and cleaned up ebuild.

5 files changed, 18 insertions, 26 deletions

diff --git a/media-sound/ermixer/ChangeLog b/media-sound/ermixer/ChangeLog
index 77536520597f..dd55a1365b53 100644
--- a/media-sound/ermixer/ChangeLog
+++ b/media-sound/ermixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ermixer
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ChangeLog,v 1.11 2003/09/22 11:57:37 pauldv Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ChangeLog,v 1.12 2004/03/16 15:27:53 eradicator Exp $
+
+  16 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> ermixer-0.7.1.ebuild,
+  ermixer-0.7.ebuild, ermixer-0.8.ebuild:
+  Added IUSE and cleaned up ebuild.
 
   22 Sep 2003; <paul@gentoo.org> metadata.xml:
   Fix metadata.xml
diff --git a/media-sound/ermixer/Manifest b/media-sound/ermixer/Manifest
index 5ca268c5957a..8093fe81bc4f 100644
--- a/media-sound/ermixer/Manifest
+++ b/media-sound/ermixer/Manifest
@@ -1,7 +1,7 @@
-MD5 6c7ebca7b5e6ec34a65c3ea93f58be6f ermixer-0.8.ebuild 728
-MD5 c81ce9322fd97ecb75f6b5d7c584ac38 ermixer-0.7.1.ebuild 631
-MD5 830eff097fbe21ec7baf98f9267f99ad ermixer-0.7.ebuild 623
-MD5 f91045f4de6593c6691a5b0449fb6156 ChangeLog 1362
+MD5 e90cb4655c305597a220a397aacd3de5 ermixer-0.8.ebuild 700
+MD5 435cc78b11187643954dde1288c20511 ermixer-0.7.1.ebuild 588
+MD5 80c9ccff66e4e1218fd9a5d54d20eae0 ermixer-0.7.ebuild 560
+MD5 fada6156e3f0a6cb0277f2c3fb81a23c ChangeLog 1524
 MD5 390ad948679686f335bcd5d172edb3f6 metadata.xml 218
 MD5 e8da6b4be22730cb4502850791ea0f01 files/digest-ermixer-0.7 64
 MD5 f9f03bb14f488877dc9415c2e0432428 files/digest-ermixer-0.8 63
diff --git a/media-sound/ermixer/ermixer-0.7.1.ebuild b/media-sound/ermixer/ermixer-0.7.1.ebuild
index a398fc261278..57942b6a4df5 100644
--- a/media-sound/ermixer/ermixer-0.7.1.ebuild
+++ b/media-sound/ermixer/ermixer-0.7.1.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-sound/ermixer/ermixer-0.7.1.ebuild,v 1.4 2004/03/01 05:37:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ermixer-0.7.1.ebuild,v 1.5 2004/03/16 15:27:53 eradicator Exp $
 
 DESCRIPTION="A full featured console-based audio mixer."
 HOMEPAGE="http://ermixer.sourceforge.net"
@@ -12,12 +12,7 @@ SLOT="0"
 KEYWORDS="x86"
 
 SRC_URI="mirror://sourceforge/ermixer/${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf || die
-	emake || die
-}
+RESTRICT="nomirror"
 
 src_install () {
 	make DESTDIR=${D} install || die
diff --git a/media-sound/ermixer/ermixer-0.7.ebuild b/media-sound/ermixer/ermixer-0.7.ebuild
index 81c5d437fd09..d338d1c9c90a 100644
--- a/media-sound/ermixer/ermixer-0.7.ebuild
+++ b/media-sound/ermixer/ermixer-0.7.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ermixer-0.7.ebuild,v 1.5 2004/03/01 05:37:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ermixer-0.7.ebuild,v 1.6 2004/03/16 15:27:53 eradicator Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="A Full Featured Audio Mixer"
 SRC_URI="http://erevan.cuore.org/files/ermixer/${P}.tar.bz2"
 HOMEPAGE="http://ermixer.sourceforge.net"
@@ -13,11 +12,6 @@ KEYWORDS="x86"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
diff --git a/media-sound/ermixer/ermixer-0.8.ebuild b/media-sound/ermixer/ermixer-0.8.ebuild
index a4220b5bcd03..d39873b88050 100644
--- a/media-sound/ermixer/ermixer-0.8.ebuild
+++ b/media-sound/ermixer/ermixer-0.8.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ermixer-0.8.ebuild,v 1.10 2004/03/01 05:37:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ermixer/ermixer-0.8.ebuild,v 1.11 2004/03/16 15:27:53 eradicator Exp $
+
+IUSE="qt"
 
 DESCRIPTION="A full featured console-based audio mixer."
 HOMEPAGE="http://ermixer.sourceforge.net"
@@ -13,13 +15,10 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc alpha"
 
 SRC_URI="mirror://sourceforge/ermixer/${P}.tar.gz"
-S="${WORKDIR}/${P}"
+RESTRICT="nomirror"
 
 src_compile() {
-	local myconf
-
-	use qt && myconf="--enable-qt=yes"
-	econf ${myconf}|| die
+	econf `use_enable qt` || die
 	emake || die
 }