Groovy 1.6.5 bump.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 129 insertions, 12 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 564829c0df95..7da7e0809f19 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/groovy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.33 2009/08/07 07:23:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.34 2009/10/15 13:58:32 elvanor Exp $
+
+*groovy-1.6.5 (15 Oct 2009)
+
+  15 Oct 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +groovy-1.6.5.ebuild:
+  Version bump to 1.6.5.
 
   07 Aug 2009; Zac Medico <zmedico@gentoo.org> groovy-1.6.3.ebuild:
   Block older versions of groovy since they defined SLOT=1 and have file
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 10e44b2bc605..a5a17c932535 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX groovy-build.patch 5258 RMD160 02c04c7807966ef195e3f2f4f7ce5fcb22bffc8c SHA1 6e9019ff6a7784f6578fe1078d7b853182a71b98 SHA256 fbbb5fc2f89b2a1481c81091cb289d7bb2a27eef096862fd5fa3af7df7b2bbf1
 DIST groovy-src-1.6.3.zip 9889099 RMD160 ed236f24a3afedf8fd5e9f03cea9e1687e8719a8 SHA1 2b3648cce1369e043bf1a4130ea4a2a5c3bd6c08 SHA256 ac33a35d56b737847fa5c4bd3e408f18142a6641941f0f00b980a997ee0c22f7
+DIST groovy-src-1.6.5.zip 9900220 RMD160 1248287d13ea7cb765dc90fbf61583953851b6b0 SHA1 18afd0f68240bba2e5610c68e9d016a9ffab2512 SHA256 afa65e0ce0e77a96b0871225ee38c6ae8545df70c8538ad4476ac0b0a0ccf9fd
 EBUILD groovy-1.6.3.ebuild 3864 RMD160 53e6ba3fa1c8c34006648a67559bc8a3f61edcae SHA1 11d78636a6fc718bfc53143d9f456461dab881fe SHA256 6b5cd78b0417d1e801dcf21bcc1dd351cf524317f064efc8f713f57a69656ec4
-MISC ChangeLog 6017 RMD160 4a529a4a836b5845960ee880152c5e6c45bfcbb9 SHA1 e26b86cf8b86de25d2ce1608b5c8f07baa25f065 SHA256 f6ed7cace15ae8e351ad6c2fe1d42e9f3f727476e819c755cdac2c017931ebe8
+EBUILD groovy-1.6.5.ebuild 3830 RMD160 72b386472f7f903f8308e6f2a72d8c148c38280b SHA1 38b609bb709ecd652413660641eb00a40eb20bc9 SHA256 c7906c71932e0d1aa705ae2d02e391b224b2ef507a448f08b493cc7f68ffccb3
+MISC ChangeLog 6153 RMD160 1817828acfd00d9ddcfb1846091d9253ad72f5d7 SHA1 d094efc982b15ab7ac19fe7d8573c0df42fbf0d2 SHA256 89bc2d79160a7a724585d634799980d43efd6e3f80604bbe41d8a1ad7d3d13e3
 MISC metadata.xml 832 RMD160 94f02ba09f77885d708e36c4056a56565b440e27 SHA1 0298fa4dcead2f1f857d767535cc7b42679a4c59 SHA256 dca576bfd06f9afa4ecb0049225e32ed9263a1b1c5cbb44e807e5a06ee7f36b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkp71oQACgkQ/ejvha5XGaMXIgCcCnRxM8b/Oi3Sqvaqe2f6mQ59
-Zu8AoI3LtEKNKD2NmvzhAOerjA96wz7I
-=tsP+
------END PGP SIGNATURE-----
diff --git a/dev-java/groovy/groovy-1.6.5.ebuild b/dev-java/groovy/groovy-1.6.5.ebuild
new file mode 100644
index 000000000000..6f8d2878b2a1
--- /dev/null
+++ b/dev-java/groovy/groovy-1.6.5.ebuild
@@ -0,0 +1,119 @@
+# 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.6.5.ebuild,v 1.1 2009/10/15 13:58:32 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.
+
+# We currently do not build the embeddable jar (which is created using JarJar).
+# We could provide that via an USE flag.
+# We also don't use automatic build rewriting as there seems to be already some level of support
+# in the upstream build system
+
+# TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
+# as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
+# There is also a bug (visible when loading groovyConsole for instance) where asm-1.5 is put on the cp,
+# this conflicts with the 2.2 version needed by Groovy.
+
+EAPI="2"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+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="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/asm:2.2
+	dev-java/antlr:0
+	>=dev-java/xstream-1.3
+	>=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.2
+	dev-java/servletapi:2.4
+	>=dev-java/bsf-2.4
+	java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.5
+	!<dev-java/groovy-1.6.3
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		dev-java/qdox
+	)
+	test? (
+		dev-java/jmock
+		dev-java/xmlunit
+		dev-db/hsqldb
+		dev-java/commons-logging
+		dev-java/ant-junit
+		dev-java/ant-trax
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	rm -rf bootstrap
+	# security directory is needed for tests, but they currently don't pass
+	#rm -rf security
+	mkdir -p target/lib && cd target/lib
+	mkdir compile && mkdir runtime && mkdir tools
+	cd compile
+
+	java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-2.2,xstream
+	java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
+	java-pkg_jar-from --virtual jmx
+	java-pkg_jar-from --build-only ant-ivy:2
+	use doc && java-pkg_jar-from --build-only qdox-1.6
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
+	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
+}
+
+src_test() {
+	cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
+
+	java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
+
+	cd "${S}"
+	ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
+		-DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
+}
+
+src_install() {
+	java-pkg_newjar "target/dist/${PN}.jar"
+	use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
+
+	# FIXME: install those two later
+	#
+	#use doc && java-pkg_dojavadoc "target/html/api/"
+	#use doc && java-pkg_dojavadoc "target/html/gapi/"
+
+	use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
+	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
+}