Grovy 1.5.4 version bump

(Portage version: 2.1.4.4)

4 files changed, 179 insertions, 5 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 0e1ba5e0d0eb..74298919af27 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/groovy
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.25 2007/07/04 22:14:19 betelgeuse Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.26 2008/03/02 14:10:41 elvanor Exp $
+
+*groovy-1.5.4 (02 Mar 2008)
+
+  02 Mar 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/groovy-build.xml.patch, groovy-1.0-r1.ebuild, +groovy-1.5.4.ebuild:
+  Version bump to 1.5.4. Tests now compile and run with JDK 1.6, some fail
+  though.
 
   04 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> -groovy-1.0.ebuild:
   Remove old revision.
diff --git a/dev-java/groovy/files/groovy-build.xml.patch b/dev-java/groovy/files/groovy-build.xml.patch
new file mode 100644
index 000000000000..88a3635425db
--- /dev/null
+++ b/dev-java/groovy/files/groovy-build.xml.patch
@@ -0,0 +1,29 @@
+--- build.xml.orig	2008-02-01 18:49:08.000000000 +0100
++++ build.xml	2008-03-02 14:27:33.000000000 +0100
+@@ -70,7 +70,7 @@
+         </antlr>
+     </target>
+ 
+-    <target name="-init" depends="-fetchDependencies">
++    <target name="-init">
+         <echo message="Java Runtime Environment version: ${java.version}"/>
+         <echo message="Java Runtime Environment vendor: ${java.vendor}"/>
+         <echo message="Ant version: ${ant.version}"/>
+@@ -143,7 +143,7 @@
+                deprecation="on" debug="yes" source="1.4" target="1.4" fork="true" classpathref="compilePath">
+                <exclude name="**/vmplugin/v5/**" unless="groovy.build.vm5"/>
+         </javac>
+-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${mainClassesDirectory}" classpathref="runtimePath"/>
++        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${mainClassesDirectory}" classpathref="compilePath"/>
+         <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" classpathref="compilePath"/>
+     </target>
+ 
+@@ -391,7 +391,7 @@
+     </target>
+ 
+     <target name="-actuallyCreateJars"
+-            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
++            depends="-makeManifest,-initializeJars,-createBaseJar"
+             unless="testFailed"/>
+ 
+     <target name="-makeManifest">
diff --git a/dev-java/groovy/groovy-1.0-r1.ebuild b/dev-java/groovy/groovy-1.0-r1.ebuild
index 456daeaee192..3fef3d0a18dc 100644
--- a/dev-java/groovy/groovy-1.0-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.4 2007/07/04 22:14:28 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0-r1.ebuild,v 1.5 2008/03/02 14:10:41 elvanor Exp $
 
 inherit versionator java-pkg-2 java-ant-2
 
@@ -84,7 +84,7 @@ src_unpack() {
 	#  be in files/
 	#  - remove all the junit-present stuff
 	#  - remove test dependency from jar target
-	cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
+	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "Failed to update build.xml"
 
 	cd src/main
 	# This won't compile without an incestuous relationship with radeox.
diff --git a/dev-java/groovy/groovy-1.5.4.ebuild b/dev-java/groovy/groovy-1.5.4.ebuild
new file mode 100644
index 000000000000..e875e28e9c0d
--- /dev/null
+++ b/dev-java/groovy/groovy-1.5.4.ebuild
@@ -0,0 +1,138 @@
+# 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.1 2008/03/02 14:10:41 elvanor 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=""
+
+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
+}