Version bump to 1.7.10.

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

4 files changed, 131 insertions, 16 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index ed2d37de8927..b6bf1701c3d7 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/groovy
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.47 2010/12/29 18:38:39 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.48 2011/07/21 16:26:27 elvanor Exp $
+
+*groovy-1.7.10 (21 Jul 2011)
+
+  21 Jul 2011; <elvanor@gentoo.org> +groovy-1.7.10.ebuild:
+  Bump to version 1.7.10.
 
   29 Dec 2010; Markos Chandras <hwoarang@gentoo.org> groovy-1.7.5.ebuild:
   Stable on amd64 wrt bug #348255
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 9415380b4e79..39d56e68f531 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST groovy-src-1.6.8.zip 11998683 RMD160 da014eef68e57b374b1bfa60798dc998c1abab50 SHA1 50937b890c53ab547d829079cdb56e815cbaa87b SHA256 caa83f91e154211b1fcf688fb16d97d63b552fbb9e2bb240ea82fb13f90b1c80
+DIST groovy-src-1.7.10.zip 12912772 RMD160 be66162022547c4fb0b07d16c276a1de0679d58b SHA1 34b7a5709c7ede50afc8d65c63c9af28d5be2dc2 SHA256 268c4504d50347e61fd83a4d04ebddbd4bf8139a4ba599de640d5537f3e4ad0c
 DIST groovy-src-1.7.5.zip 12875363 RMD160 dbb6fe6669ddfc6d6d954ecbb989440a6826c146 SHA1 c61deb20bcdde79b48f90d1fd79ff2c6c000c268 SHA256 9864b36d681ecc4e4a8f86c8b958203f8e2c01c150a3f992f5f63df552979067
 EBUILD groovy-1.6.8.ebuild 3944 RMD160 4bf209fe6145309dc828131080ced7df75e14612 SHA1 1f68d8286b14d9721b69db2305feabe6eb7e132d SHA256 34adf1728bab814f41211416e81ca99b4075dec0d0f0ce42090572e2c66c06c3
-EBUILD groovy-1.7.5.ebuild 3814 RMD160 3b2c00ad4b3a2277a49b068e86bdd5f999076b59 SHA1 1ae4622f07a5a1941c52c7453a0a7fc6b13dc7c0 SHA256 5402883269babadf9ea50f324c758b0ebead6768a2c327deb64d5dc86cf24995
-MISC ChangeLog 7680 RMD160 24aa20dcfc6dcda10f7518f192dedd7260073807 SHA1 f5c5bb540ac853815eae2238e4756f9961793af2 SHA256 dbd938aca08948ac935d66881840ef44e8a80aecc6269597f47dd01ed047220e
+EBUILD groovy-1.7.10.ebuild 3777 RMD160 34c3413dd0c5e642bfd24d7e112fa0b048d011ed SHA1 c74c4cc239e8ff4d280dff2f453796f824f1b8e9 SHA256 0876e3015aef0f3e4fbd97f352e58d40b0d60c4a0f765492f6de1eaf80a75bca
+EBUILD groovy-1.7.5.ebuild 3813 RMD160 414fe518505c86ca2861ab1c5467931a3f85ede0 SHA1 3842f61024b68723cb74f01c5b3a70ee6966c25a SHA256 30010803e1826aed46ce12abe911f5bc2faebe17f8bc6bff2261daa11410b805
+MISC ChangeLog 7795 RMD160 5943ae8ef5fc11b05f7e20d6c6b41dddfdb72743 SHA1 c4aeea42dddf198be47b1a6dc36d5533992c8ad8 SHA256 9dc18d47775572e108cc85d62cf157a494cbe59f6342c2b9e0c9fcbd8f91a101
 MISC metadata.xml 832 RMD160 94f02ba09f77885d708e36c4056a56565b440e27 SHA1 0298fa4dcead2f1f857d767535cc7b42679a4c59 SHA256 dca576bfd06f9afa4ecb0049225e32ed9263a1b1c5cbb44e807e5a06ee7f36b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0bf+sACgkQ9/cejkQaxBCOGwCff0Tl77YDx2f66mmUH0O4kZF8
-g0YAn39jetC7TXhzerU409Vhn2Va2NZq
-=vkbx
------END PGP SIGNATURE-----
diff --git a/dev-java/groovy/groovy-1.7.10.ebuild b/dev-java/groovy/groovy-1.7.10.ebuild
new file mode 100644
index 000000000000..36415b424c78
--- /dev/null
+++ b/dev-java/groovy/groovy-1.7.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.7.10.ebuild,v 1.1 2011/07/21 16:26:27 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.
+
+EAPI="3"
+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="~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="test"
+
+CDEPEND=">=dev-java/asm-3.2
+	>=dev-java/ant-core-1.8.0
+	>=dev-java/junit-4.6
+	dev-java/antlr:0
+	dev-java/xstream
+	dev-java/jline
+	dev-java/commons-cli
+	dev-java/jansi
+	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-1.12
+	)
+	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-3,xstream,jansi
+	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.12,ant-antlr
+}
+
+src_compile() {
+	eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
+		-DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
+
+	use doc && ANT_TASKS="ant-antlr" 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
+	java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
+}
diff --git a/dev-java/groovy/groovy-1.7.5.ebuild b/dev-java/groovy/groovy-1.7.5.ebuild
index 2c87c606e703..f1706a0a83b6 100644
--- a/dev-java/groovy/groovy-1.7.5.ebuild
+++ b/dev-java/groovy/groovy-1.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.7.5.ebuild,v 1.3 2010/12/29 18:38:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.7.5.ebuild,v 1.4 2011/07/21 16:26:27 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.