[gentoo-commits] gentoo-x86 commit in dev-java/groovy: ChangeLog groovy-1.5.4-r1.ebuild groovy-1.5.4.ebuild

[Petteri Raty (betelgeuse)]

betelgeuse    09/03/29 16:40:07

  Modified:             ChangeLog groovy-1.5.4-r1.ebuild
  Removed:              groovy-1.5.4.ebuild
  Log:
  Migrate the ebuild to EAPI 2.
  (Portage version: 2.2_rc27/cvs/Linux i686)

Revision  Changes    Path
1.31                 dev-java/groovy/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	24 Mar 2009 18:43:36 -0000	1.30
+++ ChangeLog	29 Mar 2009 16:40:07 -0000	1.31
@@ -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@g.o> -groovy-1.5.4.ebuild,
+  groovy-1.5.4-r1.ebuild:
+  Migrate the ebuild to EAPI 2.
 
   24 Mar 2009; Petteri Räty <betelgeuse@g.o> -groovy-1.0-r1.ebuild:
   Remove old version.



1.2                  dev-java/groovy/groovy-1.5.4-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/groovy-1.5.4-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/groovy-1.5.4-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/groovy-1.5.4-r1.ebuild?r1=1.1&r2=1.2

Index: groovy-1.5.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.5.4-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- groovy-1.5.4-r1.ebuild	4 Jul 2008 20:00:06 -0000	1.1
+++ groovy-1.5.4-r1.ebuild	29 Mar 2009 16:40:07 -0000	1.2
@@ -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 @@
 
 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 @@
 	${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_compile() {
-	ANT_TASKS="ant-antlr"
-
 	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
 		-DtoolsLibDirectory="target/lib/compile" createJars