Bug #320835.

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

3 files changed, 127 insertions, 2 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index fd210fdb4690..ad105fd33bf5 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.44 2010/10/17 12:31:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.45 2010/10/26 11:16:13 elvanor Exp $
+
+*groovy-1.7.5 (26 Oct 2010)
+
+  26 Oct 2010; <elvanor@gentoo.org> +groovy-1.7.5.ebuild:
+  Version bump (#320835).
 
   17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -groovy-1.6.5.ebuild,
   -groovy-1.6.7.ebuild:
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index e8f3d12f18d2..f89f892add96 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,4 +1,6 @@
 DIST groovy-src-1.6.8.zip 11998683 RMD160 da014eef68e57b374b1bfa60798dc998c1abab50 SHA1 50937b890c53ab547d829079cdb56e815cbaa87b SHA256 caa83f91e154211b1fcf688fb16d97d63b552fbb9e2bb240ea82fb13f90b1c80
+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
-MISC ChangeLog 7349 RMD160 c88758fd99a1a5fa8a7f2804aaeac9db661cf3a4 SHA1 56d822d172c60b2d679126701d4706abaf328f85 SHA256 580984ec218820492bf1ecc33be8ceb5b5fdefc3426da4c520bf49fd58536075
+EBUILD groovy-1.7.5.ebuild 3815 RMD160 c70158726c8f2af5756a19a19ea609ef9d248665 SHA1 3f237539ef89edcf26a284ed41fb601ce4007ae2 SHA256 9fb76bb03f695af7ad75182527de9f6cc85b01d97e02a4d6e1a4b1b9a3e94a8d
+MISC ChangeLog 7464 RMD160 067b31b4130fe439464645481392e8831775f135 SHA1 0a49e2460d8a0db61ec37f4f1d86a82f14a12b7a SHA256 abe6ada0765bfbf856b3a170f80cb91088d1f5768fb1e11ddcec6f89fe182c49
 MISC metadata.xml 832 RMD160 94f02ba09f77885d708e36c4056a56565b440e27 SHA1 0298fa4dcead2f1f857d767535cc7b42679a4c59 SHA256 dca576bfd06f9afa4ecb0049225e32ed9263a1b1c5cbb44e807e5a06ee7f36b3
diff --git a/dev-java/groovy/groovy-1.7.5.ebuild b/dev-java/groovy/groovy-1.7.5.ebuild
new file mode 100644
index 000000000000..97cca29ac721
--- /dev/null
+++ b/dev-java/groovy/groovy-1.7.5.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2010 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.1 2010/10/26 11:16:13 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="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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
+	)
+	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.6,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
+}