Fix building with virtual/jdk:1.4 with the help of java-virtuals/jmx.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

3 files changed, 154 insertions, 2 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index e082ff0bf232..1492d15dde7d 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/groovy
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.27 2008/03/04 01:42:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.28 2008/07/04 20:00:06 betelgeuse Exp $
+
+*groovy-1.5.4-r1 (04 Jul 2008)
+
+  04 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +groovy-1.5.4-r1.ebuild:
+  Fix building with virtual/jdk:1.4 with the help of java-virtuals/jmx.
 
   04 Mar 2008; Michael Sterrett <mr_bones_@gentoo.org> groovy-1.5.4.ebuild:
   add missing test to IUSE
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 7f829352e914..01689d70c571 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml-1.0 6050 RMD160 fd445f4558c780d3518d5d845e993cfb5bab0762 SHA1 6312ff408db59840659768be94cc1fb3a1b18b24 SHA256 c1c67095b88ca3cb7a754a75c8a0a0c5d242371ee89036941ceacbd017392d30
 AUX build.xml-1.0_rc01 5860 RMD160 ecabd798fc1b4ff10502fa298b3e985b2b22771c SHA1 638dee00a4e5d0466d67fd63c9d06dbbd3a5fb21 SHA256 27b2c31c174f74314d8d75accbe08acfcf5f49ebeae9831e2869ed3d9f54a44d
 AUX groovy-1.0-compiler-exit-code.patch 581 RMD160 738498ac3883d1dabf0ad8f75d30bd8a23a82cf9 SHA1 a193ea0b6875e9c7a266b9c4e5ec3d568f4a4bcd SHA256 0a5fb73cbfd4913903000c7632fb931f8611cb7d7ff04c6004ad5659d312484b
@@ -6,6 +9,14 @@ AUX groovy-build.xml.patch 1395 RMD160 4dbfd5743c571210601490f5becd80cfc79a341d
 DIST groovy-1.0-src.tar.gz 966931 RMD160 dad940d5bbe10a16686dc619a094c2cbdc0d52f1 SHA1 010a21f5694a8a35756f7c491ce0518ff954812c SHA256 63d1e47d80a31567792b65dfe19653ab98ce74a6876fb05b9423b83ecc960599
 DIST groovy-src-1.5.4.zip 6899116 RMD160 377fd8c17fca44a5291ce3003214af8a9a3b61d7 SHA1 490f6b20b1ef7f6c6ca6047516b2a500114f00a3 SHA256 695051ab0117b8dba7e9eeef83cfe98901f62ba61cdf220bdea86604b2335263
 EBUILD groovy-1.0-r1.ebuild 3801 RMD160 7c06ee5ceb2988823cf5ae82bfd7cb6f4bdc078a SHA1 2eb62035a6a982abf57d205afd4d6ab0c0f8e6df SHA256 c33f7aa6414f4f615273afc1f175d4672d9953a76afb7bf65d1c5fdd91140180
+EBUILD groovy-1.5.4-r1.ebuild 3449 RMD160 33aed0cea6c5ffb15bca7a93c8d6355b8ed00e2c SHA1 6308a0e1bd87cda0ac40a399edd56547852ea34f SHA256 93168c808202517925f9bfe66fca5f4962339d287c233ca492fa5807b3c94661
 EBUILD groovy-1.5.4.ebuild 3451 RMD160 20fa934d7d9d1cbda2b487348b9bde302ba45a5d SHA1 a61dbcb6aba6e1dd81c8dbc3f15801bddd8b1f72 SHA256 29a35d1e02e9a6078e677a491f40637117895b45ac7a31463c84eaeee0033272
-MISC ChangeLog 4857 RMD160 12422eba2cb6821dbf730a1f17ada8494f6e87d3 SHA1 97844ce568fd31b804d7e99927543780e517f2aa SHA256 c68d8f7eeb1679e57667c421773afed5aaa901fb181a7c0b1d1132b5a769927c
+MISC ChangeLog 5043 RMD160 b5ee0e49363ae9d6b0171e2f0024d345085dea46 SHA1 4a284975476fc2324ac7bfded7b9d7f2c9136221 SHA256 d7c88ed31ed8cf9e5a229fefd92c8a8d40c8a0746b862bf673f0a4bd306eed9a
 MISC metadata.xml 830 RMD160 e44201b843377223db467fe70be144015cab7b59 SHA1 37a0746d1e2a77a17c787679a9999eb51dad7988 SHA256 4b3a3459adb24e4c0b26ce6393047369f82ab7d6075c19c2926cf9cd256794ab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhugU8ACgkQcxLzpIGCsLSvuQCfabaaKB1iJl6qwGDlFwN2LO6Z
+4osAnia3YDLo59i99U30AQtRrsQp7pYg
+=WhLM
+-----END PGP SIGNATURE-----
diff --git a/dev-java/groovy/groovy-1.5.4-r1.ebuild b/dev-java/groovy/groovy-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..7cb005aa1da2
--- /dev/null
+++ b/dev-java/groovy/groovy-1.5.4-r1.ebuild
@@ -0,0 +1,135 @@
+# 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-r1.ebuild,v 1.1 2008/07/04 20:00:06 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.
+#
+# 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="test"
+
+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
+	java-virtuals/jmx
+
+	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}"
+
+	epatch "${FILESDIR}/${PN}-build.xml.patch"
+	java-ant_xml-rewrite -f build.xml --delete -e junit -a fork
+
+	rm -rf bootstrap
+	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
+	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
+	java-pkg_jar-from --virtual jmx
+
+	# Following is for documentation only
+
+	java-pkg_jar-from qdox-1.6
+}
+
+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 jmock-1.0
+	java-pkg_jar-from xmlunit-1
+	java-pkg_jar-from hsqldb
+
+	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
+}