Migrate the ebuild to EAPI 2.

Package-Manager: portage-2.2_rc27/cvs/Linux i686

4 files changed, 18 insertions, 156 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 681a4089e9b1..c2d112b7d345 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.30 2009/03/24 18:43:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.31 2009/03/29 16:40:07 betelgeuse Exp $
+
+  29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -groovy-1.5.4.ebuild,
+  groovy-1.5.4-r1.ebuild:
+  Migrate the ebuild to EAPI 2.
 
   24 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -groovy-1.0-r1.ebuild:
   Remove old version.
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 36df232e1a83..4a5f12564be4 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -7,14 +7,13 @@ AUX groovy-1.0-compiler-exit-code.patch 581 RMD160 738498ac3883d1dabf0ad8f75d30b
 AUX groovy-1.0_rc01-compiler-exit-code.patch 1298 RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 SHA1 ef45228ad25a704c4a9f08b43f7f4c519551a692 SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3
 AUX groovy-build.xml.patch 1395 RMD160 4dbfd5743c571210601490f5becd80cfc79a341d SHA1 cb1d95dc820bf7c7e1732e58d711fef3b7b138de SHA256 fad7b519993253ce60ca1cc2a251d8c151b4723393d1dede733c902d1debf8c5
 DIST groovy-src-1.5.4.zip 6899116 RMD160 377fd8c17fca44a5291ce3003214af8a9a3b61d7 SHA1 490f6b20b1ef7f6c6ca6047516b2a500114f00a3 SHA256 695051ab0117b8dba7e9eeef83cfe98901f62ba61cdf220bdea86604b2335263
-EBUILD groovy-1.5.4-r1.ebuild 3449 RMD160 33aed0cea6c5ffb15bca7a93c8d6355b8ed00e2c SHA1 6308a0e1bd87cda0ac40a399edd56547852ea34f SHA256 93168c808202517925f9bfe66fca5f4962339d287c233ca492fa5807b3c94661
-EBUILD groovy-1.5.4.ebuild 3451 RMD160 20fa934d7d9d1cbda2b487348b9bde302ba45a5d SHA1 a61dbcb6aba6e1dd81c8dbc3f15801bddd8b1f72 SHA256 29a35d1e02e9a6078e677a491f40637117895b45ac7a31463c84eaeee0033272
-MISC ChangeLog 5234 RMD160 49b428adaca5c2816f7c964415e3bd64f8b19bff SHA1 1549cd35990e08629047af413c306806862eee52 SHA256 cdff348f0fd5696b174e5535cd7381cebce6437dbcc3a58c44ba9be0338f60c8
+EBUILD groovy-1.5.4-r1.ebuild 3449 RMD160 d5437ab1cf7f5b629d0e7c76203715fb5cfbb97a SHA1 ad06da49df68df936016a515ba91b4de919219cb SHA256 0fd399187b11174346eed84983311b2b7201e056b24cff5c73aefab2dc56a300
+MISC ChangeLog 5368 RMD160 46f5bd1aa5cb7528e5ef5c510fc9d5828efe2884 SHA1 5b7e43dcd282f4ffe2ffc4ad248ac22fcde4a0a0 SHA256 329215a6f94d8b9cf496c9355654fa5e94581d9188b2a1f726240c19148f9a3e
 MISC metadata.xml 832 RMD160 94f02ba09f77885d708e36c4056a56565b440e27 SHA1 0298fa4dcead2f1f857d767535cc7b42679a4c59 SHA256 dca576bfd06f9afa4ecb0049225e32ed9263a1b1c5cbb44e807e5a06ee7f36b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknJKjkACgkQcxLzpIGCsLRquQCeM1VV83mS3ySBCUe1Ny3JOEJZ
-vG4An03F4cT90cCuetb8sehcMN6D8egm
-=p5/1
+iEYEARECAAYFAknPpG8ACgkQcxLzpIGCsLSIwACbBpbT21IPaf8QDu+UM8rjLoe1
+7A4AoJiIwtoo1cxc02e31ZPJ/Nql5B0b
+=rXZV
 -----END PGP SIGNATURE-----
diff --git a/dev-java/groovy/groovy-1.5.4-r1.ebuild b/dev-java/groovy/groovy-1.5.4-r1.ebuild
index 7cb005aa1da2..75d527a5e6ee 100644
--- a/dev-java/groovy/groovy-1.5.4-r1.ebuild
+++ b/dev-java/groovy/groovy-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.5.4-r1.ebuild,v 1.1 2008/07/04 20:00:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.5.4-r1.ebuild,v 1.2 2009/03/29 16:40:07 betelgeuse Exp $
 
 # Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
 # We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
@@ -15,9 +15,11 @@
 # TODO: We should implement the doc USE flag properly
 #
 
+EAPI="2"
+WANT_ANT_TASKS="ant-antlr ant-trax"
+
 inherit versionator java-pkg-2 java-ant-2
 
-EAPI="1"
 JAVA_PKG_IUSE="doc"
 MY_PV=${PV/_rc/-RC-}
 MY_P="${PN}-${MY_PV}"
@@ -33,7 +35,7 @@ IUSE="test"
 
 CDEPEND="
 	dev-java/asm:2.2
-	dev-java/antlr:0
+	>=dev-java/antlr-2.7.7:0[java]
 	>=dev-java/xstream-1.1.1
 	>=dev-java/junit-3.8.2:0
 	>=dev-java/jline-0.9.91
@@ -59,17 +61,14 @@ RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
 
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-antlr
+	app-arch/unzip
 	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 JAVA_PKG_BSFIX=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+java_prepare() {
 	epatch "${FILESDIR}/${PN}-build.xml.patch"
 	java-ant_xml-rewrite -f build.xml --delete -e junit -a fork
 
@@ -100,8 +99,6 @@ src_unpack() {
 }
 
 src_compile() {
-	ANT_TASKS="ant-antlr"
-
 	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
 		-DtoolsLibDirectory="target/lib/compile" createJars
 
diff --git a/dev-java/groovy/groovy-1.5.4.ebuild b/dev-java/groovy/groovy-1.5.4.ebuild
deleted file mode 100644
index 57d71a45fb77..000000000000
--- a/dev-java/groovy/groovy-1.5.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.5.4.ebuild,v 1.2 2008/03/04 01:42:39 mr_bones_ Exp $
-
-# Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
-# We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
-#
-# Note that in the previous 1.0 ebuild, we used the Ant Maven plugin. We don't do that anymore.
-
-# We currently do not build the embeddable jar (which is created using JarJar). Maybe we should...
-# We also don't use automatic build rewriting as there seems to be already some level of support
-# in the upstream build system
-#
-
-# TODO: We should implement the doc USE flag properly
-#
-
-inherit versionator java-pkg-2 java-ant-2
-
-EAPI="1"
-JAVA_PKG_IUSE="doc"
-MY_PV=${PV/_rc/-RC-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-
-SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
-LICENSE="codehaus-groovy"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-
-CDEPEND="
-	dev-java/asm:2.2
-	dev-java/antlr:0
-	>=dev-java/xstream-1.1.1
-	>=dev-java/junit-3.8.2:0
-	>=dev-java/jline-0.9.91
-	>=dev-java/ant-core-1.7.0
-	>=dev-java/commons-cli-1.0
-	>=dev-java/mockobjects-0.09
-	~dev-java/servletapi-2.4
-	=dev-java/mx4j-core-3.0*
-	>=dev-java/bsf-2.4
-
-	test? (
-	dev-java/jmock
-	dev-java/xmlunit
-	dev-db/hsqldb
-	dev-java/ant-junit
-	)
-
-	dev-java/qdox
-	"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-antlr
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_PKG_BSFIX=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	mkdir -p target/lib && cd target/lib
-
-	mkdir compile && mkdir runtime && mkdir tools
-
-	cd compile
-
-	java-pkg_jar-from commons-cli-1
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from antlr
-	java-pkg_jar-from asm-2.2
-	java-pkg_jar-from xstream
-	java-pkg_jar-from mockobjects
-	java-pkg_jar-from jline
-	java-pkg_jar-from junit
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from bsf-2.3
-
-	# Following is for documentation only
-
-	java-pkg_jar-from qdox-1.6
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-build.xml.patch"
-
-	rm -rf bootstrap
-	rm -rf security
-}
-
-src_compile() {
-	ANT_TASKS="ant-antlr"
-
-	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
-		-DtoolsLibDirectory="target/lib/compile" createJars
-
-	# This works
-
-	#ANT_TASKS="none" eant -Dno.grammars -DruntimeLibDirectory="target/lib/compile" \
-	# -DtoolsLibDirectory="target/lib/compile" doc
-	#use doc && eant doc
-}
-
-src_test() {
-	cd "${S}/target/lib" && mkdir test && cd compile
-
-	java-pkg_jar-from --build-only jmock-1.0
-	java-pkg_jar-from --build-only xmlunit-1
-	java-pkg_jar-from hsqldb
-	java-pkg_jar-from ant-junit
-
-	#java-pkg_jar-from junit
-	#java-pkg_jar-from ant-core
-
-	cd "${S}"
-	ANT_TASKS="ant-junit ant-antlr ant-trax" eant test -DruntimeLibDirectory="target/lib/compile" \
-		-DtestLibDirectory="target/lib/compile"
-}
-
-src_install() {
-	java-pkg_newjar "target/dist/${P}.jar"
-	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
-	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
-	java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
-	java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
-
-	# java-pkg_dolauncher "grok" --main org.codehaus.groovy.tools.Grok Grok does not exist anymore
-}