add inherit eutils

4 files changed, 28 insertions, 62 deletions

diff --git a/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild b/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
index dc41531a3f12..4c8621350c24 100644
--- a/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.6 2004/03/11 02:47:52 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.7 2004/04/16 02:21:38 vapier Exp $
 
-inherit java-pkg
+inherit java-pkg eutils
 
-IUSE="doc antlr bcel bsh javamail jdepend jsch junit jython log4j oro regexp rhino xalan xerces"
-
-S="${WORKDIR}/apache-ant-${PV}"
 DESCRIPTION="Apache ANT Optional Tasks Jar Files"
-SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
+SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="-* ~x86"
+IUSE="doc antlr bcel bsh javamail jdepend jsch junit jython log4j oro regexp rhino xalan xerces"
+
 DEPEND="=dev-java/ant-1.6.0-r2
 	>=dev-java/java-config-1.2
 	log4j? ( >=dev-java/log4j-1.2.8 )
@@ -32,16 +32,8 @@ DEPEND="=dev-java/ant-1.6.0-r2
 	regexp? ( >=dev-java/regexp-1.3 )
 	jython? ( >=dev-java/jython-2.1 )
 	javamail? ( >=dev-java/javamail-1.3 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
 
-	# Patch build.sh to die with non-zero exit code in case of errors.
-	# This patch may be useful for all ant versions.
-#	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
-}
+S="${WORKDIR}/apache-ant-${PV}"
 
 src_compile() {
 
diff --git a/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild b/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
index 9db625a2385c..6696cc735339 100644
--- a/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.5 2004/03/11 02:47:52 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.6 2004/04/16 02:22:15 vapier Exp $
 
-inherit java-pkg
+inherit java-pkg eutils
 
-IUSE="doc javamail"
-
-S="${WORKDIR}/apache-ant-${PV}"
 DESCRIPTION="Apache ANT Optional Tasks Jar Files"
-SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
+SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc javamail"
+
 DEPEND="=dev-java/ant-1.6.0-r3
 	>=dev-java/java-config-1.2
 	>=dev-java/log4j-1.2.8
@@ -32,19 +32,10 @@ DEPEND="=dev-java/ant-1.6.0-r3
 	>=dev-java/regexp-1.3
 	>=dev-java/jython-2.1
 	javamail? ( >=dev-java/javamail-1.3 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
 
-	# Patch build.sh to die with non-zero exit code in case of errors.
-	# This patch may be useful for all ant versions.
-#	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
-}
+S="${WORKDIR}/apache-ant-${PV}"
 
 src_compile() {
-
 	addwrite "/proc/self/maps"
 	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
diff --git a/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild b/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild
index 789a4ca368df..bb1ebd9a9f22 100644
--- a/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild,v 1.4 2004/03/23 20:25:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1-r1.ebuild,v 1.5 2004/04/16 02:22:41 vapier Exp $
 
-inherit java-pkg
+inherit java-pkg eutils
 
-IUSE="doc javamail"
-
-S="${WORKDIR}/apache-ant-${PV}"
 DESCRIPTION="Apache ANT Optional Tasks Jar Files"
+HOMEPAGE="http://ant.apache.org/"
 SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
-HOMEPAGE="http://ant.apache.org"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc javamail"
+
 DEPEND="=dev-java/ant-${PV}-r1
 	>=dev-java/java-config-1.2
 	>=dev-java/log4j-1.2.8
@@ -33,17 +33,9 @@ DEPEND="=dev-java/ant-${PV}-r1
 	javamail? ( >=dev-java/javamail-1.3 )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Patch build.sh to die with non-zero exit code in case of errors.
-	# This patch may be useful for all ant versions.
-#	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
-}
+S="${WORKDIR}/apache-ant-${PV}"
 
 src_compile() {
-
 	addwrite "/proc/self/maps"
 	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
diff --git a/dev-java/ant-optional/ant-optional-1.6.1.ebuild b/dev-java/ant-optional/ant-optional-1.6.1.ebuild
index 4b10874cf575..421458ce5928 100644
--- a/dev-java/ant-optional/ant-optional-1.6.1.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.5 2004/03/17 04:05:37 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.6 2004/04/16 02:23:23 vapier Exp $
 
-inherit java-pkg
+inherit java-pkg eutils
 
-IUSE="doc javamail"
-
-S="${WORKDIR}/apache-ant-${PV}"
 DESCRIPTION="Apache ANT Optional Tasks Jar Files"
+HOMEPAGE="http://ant.apache.org/"
 SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
-HOMEPAGE="http://ant.apache.org"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc javamail"
+
 DEPEND="=dev-java/ant-${PV}
 	>=dev-java/java-config-1.2
 	>=dev-java/log4j-1.2.8
@@ -31,19 +31,10 @@ DEPEND="=dev-java/ant-${PV}
 	>=dev-java/regexp-1.3
 	>=dev-java/jython-2.1
 	javamail? ( >=dev-java/javamail-1.3 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
 
-	# Patch build.sh to die with non-zero exit code in case of errors.
-	# This patch may be useful for all ant versions.
-#	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
-}
+S="${WORKDIR}/apache-ant-${PV}"
 
 src_compile() {
-
 	addwrite "/proc/self/maps"
 	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then