add inherit eutils

3 files changed, 20 insertions, 28 deletions

diff --git a/app-misc/mc/mc-4.6.0-r3.ebuild b/app-misc/mc/mc-4.6.0-r3.ebuild
index 0eb845ae08d2..ec255b362515 100644
--- a/app-misc/mc/mc-4.6.0-r3.ebuild
+++ b/app-misc/mc/mc-4.6.0-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r3.ebuild,v 1.13 2004/03/14 10:52:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r3.ebuild,v 1.14 2004/04/06 04:20:51 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 IUSE="gpm nls samba ncurses X slang"
 
diff --git a/app-misc/mc/mc-4.6.0-r4.ebuild b/app-misc/mc/mc-4.6.0-r4.ebuild
index 6829361be6b0..99be68941d93 100644
--- a/app-misc/mc/mc-4.6.0-r4.ebuild
+++ b/app-misc/mc/mc-4.6.0-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r4.ebuild,v 1.7 2004/03/14 10:52:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r4.ebuild,v 1.8 2004/04/06 04:20:58 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 IUSE="gpm nls samba ncurses X slang"
 
diff --git a/app-misc/mc/mc-4.6.0-r5.ebuild b/app-misc/mc/mc-4.6.0-r5.ebuild
index 663e246f8673..8464a6babda9 100644
--- a/app-misc/mc/mc-4.6.0-r5.ebuild
+++ b/app-misc/mc/mc-4.6.0-r5.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r5.ebuild,v 1.1 2004/03/29 10:46:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r5.ebuild,v 1.2 2004/04/06 04:22:43 vapier Exp $
 
-inherit flag-o-matic
-
-IUSE="gpm nls samba ncurses X slang"
+inherit flag-o-matic eutils
 
 DESCRIPTION="GNU Midnight Commander cli-based file manager"
 HOMEPAGE="http://www.ibiblio.org/mc/"
@@ -12,6 +10,11 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/utils/file/managers/${PN}/${P}.tar.gz
 	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib-3.0.0.patch.bz2
 	http://www.spock.mga.com.pl/public/gentoo/${P}-sambalib.patch.bz2"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ia64 x86 ppc sparc alpha mips hppa amd64"
+IUSE="gpm nls samba ncurses X slang"
+
 DEPEND=">=sys-fs/e2fsprogs-1.19
 	ncurses? ( >=sys-libs/ncurses-5.2-r5 )
 	=dev-libs/glib-2*
@@ -21,12 +24,6 @@ DEPEND=">=sys-fs/e2fsprogs-1.19
 	samba? ( net-fs/samba )
 	X? ( virtual/x11 )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ia64 x86 ppc sparc alpha mips hppa amd64"
-
-filter-flags -malign-double
-
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
@@ -41,30 +38,25 @@ src_unpack() {
 }
 
 src_compile() {
+	filter-flags -malign-double
+
 	local myconf=""
 
-	if ! use slang && ! use ncurses
-	    then
+	if ! use slang && ! use ncurses ; then
 		myconf="${myconf} --with-screen=mcslang"
-	    elif
-		use ncurses && ! use slang
-	    then
+	elif use ncurses && ! use slang ; then
 		myconf="${myconf} --with-screen=ncurses"
-	    else
+	else
 		use slang && myconf="${myconf} --with-screen=slang"
 	fi
 
-	use gpm \
-	    && myconf="${myconf} --with-gpm-mouse" \
-	    || myconf="${myconf} --without-gpm-mouse"
+	myconf="${myconf} `use_with gpm gpm-mouse`"
 
 	use nls \
 	    && myconf="${myconf} --with-included-gettext" \
 	    || myconf="${myconf} --disable-nls"
 
-	use X \
-	    && myconf="${myconf} --with-x" \
-	    || myconf="${myconf} --without-x"
+	myconf="${myconf} `use_with X x`"
 
 	use samba \
 	    && myconf="${myconf} --with-samba --with-configdir=/etc/samba
@@ -84,11 +76,11 @@ src_compile() {
 
 src_install() {
 	 cat ${FILESDIR}/chdir-4.6.0.gentoo >>\
-	 ${S}/lib/mc-wrapper.sh
+		 ${S}/lib/mc-wrapper.sh
 
 	einstall || die
 
-	dodoc ABOUT-NLS COPYING* ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
+	dodoc ChangeLog AUTHORS MAINTAINERS FAQ INSTALL* NEWS README*
 
 	insinto /usr/share/mc
 	doins ${FILESDIR}/mc.gentoo