clean up ugly ebuilds

6 files changed, 45 insertions, 50 deletions

diff --git a/net-irc/epic4/epic4-1.1.14-r1.ebuild b/net-irc/epic4/epic4-1.1.14-r1.ebuild
index e9bfd09046fc..7b0f66968985 100644
--- a/net-irc/epic4/epic4-1.1.14-r1.ebuild
+++ b/net-irc/epic4/epic4-1.1.14-r1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14-r1.ebuild,v 1.4 2004/05/29 16:16:27 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14-r1.ebuild,v 1.5 2004/05/30 02:05:52 vapier Exp $
 
-IUSE="ipv6 perl ssl tcltk"
+inherit flag-o-matic
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://prbh.org/pub/epic/EPIC4-ALPHA/${P}.tar.bz2
 	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-HOMEPAGE="http://epicsol.org"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ppc ~ia64 ~alpha ~hppa"
+IUSE="ipv6 perl ssl tcltk"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )
 	tcltk? ( dev-lang/tcl )"
 
-inherit flag-o-matic
-replace-flags "-O?" "-O"
-
 src_compile() {
+	replace-flags "-O?" "-O"
+
 	myconf=""
 
 	myconf="${myconf} `use_with ipv6`"
diff --git a/net-irc/epic4/epic4-1.1.14.ebuild b/net-irc/epic4/epic4-1.1.14.ebuild
index 3fb05c5fd95e..0cc70aad47be 100644
--- a/net-irc/epic4/epic4-1.1.14.ebuild
+++ b/net-irc/epic4/epic4-1.1.14.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14.ebuild,v 1.4 2004/05/29 16:16:27 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.14.ebuild,v 1.5 2004/05/30 02:05:52 vapier Exp $
 
-IUSE="ipv6 perl ssl tcltk"
+inherit flag-o-matic
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://prbh.org/pub/epic/EPIC4-ALPHA/${P}.tar.bz2
 	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-HOMEPAGE="http://epicsol.org"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ppc ia64 ~alpha ~hppa"
+IUSE="ipv6 perl ssl tcltk"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )
 	tcltk? ( dev-lang/tcl )"
 
-inherit flag-o-matic
-replace-flags "-O?" "-O"
-
 src_compile() {
+	replace-flags "-O?" "-O"
+
 	myconf=""
 
 	use ipv6 \
diff --git a/net-irc/epic4/epic4-1.1.16-r1.ebuild b/net-irc/epic4/epic4-1.1.16-r1.ebuild
index 2efe70f2dcc0..d7c475eb5156 100644
--- a/net-irc/epic4/epic4-1.1.16-r1.ebuild
+++ b/net-irc/epic4/epic4-1.1.16-r1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16-r1.ebuild,v 1.3 2004/04/27 22:08:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16-r1.ebuild,v 1.4 2004/05/30 02:05:52 vapier Exp $
 
-IUSE="ipv6 perl ssl tcltk"
+inherit flag-o-matic eutils
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://prbh.org/pub/epic/EPIC4-ALPHA/${P}.tar.bz2
 	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-HOMEPAGE="http://epicsol.org"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ia64 ~alpha hppa amd64"
+IUSE="ipv6 perl ssl tcltk"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )
 	tcltk? ( dev-lang/tcl )"
 
-inherit flag-o-matic eutils
-replace-flags "-O?" "-O"
-
 src_compile() {
+	replace-flags "-O?" "-O"
+
 	myconf=""
 
 	epatch ${FILESDIR}/epic-defaultserver.patch
@@ -38,7 +38,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	einstall \
 		sharedir=${D}/usr/share \
 		libexecdir=${D}/usr/lib/misc || die
diff --git a/net-irc/epic4/epic4-1.1.16.ebuild b/net-irc/epic4/epic4-1.1.16.ebuild
index 101ed3542561..74b04c22dab9 100644
--- a/net-irc/epic4/epic4-1.1.16.ebuild
+++ b/net-irc/epic4/epic4-1.1.16.ebuild
@@ -1,27 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16.ebuild,v 1.5 2004/01/03 17:40:05 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.1.16.ebuild,v 1.6 2004/05/30 02:05:52 vapier Exp $
 
-IUSE="ipv6 perl ssl tcltk"
+inherit flag-o-matic
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://prbh.org/pub/epic/EPIC4-ALPHA/${P}.tar.bz2
 	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-HOMEPAGE="http://epicsol.org"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ~ppc ia64 ~alpha ~hppa amd64"
+IUSE="ipv6 perl ssl tcltk"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )
 	tcltk? ( dev-lang/tcl )"
 
-inherit flag-o-matic
-replace-flags "-O?" "-O"
-
 src_compile() {
+	replace-flags "-O?" "-O"
 	myconf=""
 
 	myconf="${myconf} `use_with ipv6`"
diff --git a/net-irc/epic4/epic4-1.2.6.ebuild b/net-irc/epic4/epic4-1.2.6.ebuild
index bf53b790b1d0..285d93c927c7 100644
--- a/net-irc/epic4/epic4-1.2.6.ebuild
+++ b/net-irc/epic4/epic4-1.2.6.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.2.6.ebuild,v 1.2 2004/04/27 22:08:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.2.6.ebuild,v 1.3 2004/05/30 02:05:52 vapier Exp $
 
-IUSE="ipv6 perl ssl tcltk"
+inherit flag-o-matic eutils
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-BETA/${P}.tar.bz2
 	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20030114.tar.gz"
-HOMEPAGE="http://epicsol.org"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~ia64 ~alpha ~hppa"
+IUSE="ipv6 perl ssl tcltk"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )
 	tcltk? ( dev-lang/tcl )"
 
-inherit flag-o-matic eutils
-replace-flags "-O?" "-O"
-
 src_compile() {
+	replace-flags "-O?" "-O"
+
 	myconf=""
 
 	myconf="${myconf} `use_with ipv6`"
diff --git a/net-irc/epic4/epic4-2.0.ebuild b/net-irc/epic4/epic4-2.0.ebuild
index 118df184fdc4..9ac03414e957 100644
--- a/net-irc/epic4/epic4-2.0.ebuild
+++ b/net-irc/epic4/epic4-2.0.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0.ebuild,v 1.5 2004/05/01 23:55:26 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-2.0.ebuild,v 1.6 2004/05/30 02:05:52 vapier Exp $
 
-IUSE="ipv6 perl ssl"
+inherit flag-o-matic eutils
 
 DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
 	 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20040308.tar.gz"
-HOMEPAGE="http://epicsol.org"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~ia64 ~alpha ~hppa sparc ~amd64"
+IUSE="ipv6 perl ssl"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl? ( >=dev-lang/perl-5.6.1 )
 	ssl? ( >=dev-libs/openssl-0.9.5 )"
 
-inherit flag-o-matic eutils
-replace-flags "-O?" "-O"
-
 src_compile() {
-	myconf=""
-
-	myconf="${myconf} `use_with ipv6`"
-	myconf="${myconf} `use_with perl`"
-	myconf="${myconf} `use_with ssl`"
+	replace-flags "-O?" "-O"
 
 	epatch ${FILESDIR}/epic-defaultserver.patch || die "patch failed"
 
 	econf \
 		--libexecdir=/usr/lib/misc \
-		${myconf} || die
-
+		`use_with ipv6` \
+		`use_with perl` \
+		`use_with ssl` \
+		|| die
 	make || die
 }