Version Bump.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 148 insertions, 15 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index e2d2dae9933e..197d894f8f9e 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/groovy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.49 2011/08/13 07:46:02 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.50 2012/01/28 09:43:04 ali_bush Exp $
+
+*groovy-1.8.5 (28 Jan 2012)
+
+  28 Jan 2012; Alistair Bush <ali_bush@gentoo.org> +groovy-1.8.5.ebuild,
+  +files/groovy-1.8-build-pref-locking-fix.patch:
+  Version Bump to latest stable.
 
   13 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> groovy-1.7.5.ebuild:
   ppc stable wrt #348255
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 7ecfdfa08766..2a9b3f863326 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX groovy-1.8-build-pref-locking-fix.patch 560 RMD160 271b3019ba920f80730d19998b838d3f24e5ad88 SHA1 61809137342c26084bc22bea690d86a58337e545 SHA256 46206d33f141257a63de4e1a1a834bea56b1f238039557ba4073883ba630f5ef
 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
+DIST groovy-src-1.8.5.zip 13131836 RMD160 8afc23cbf14963b532976fc0a0366f2c4dee7e00 SHA1 1a806d168bd4eaeec571fb2ecc1bc22f3c9ef498 SHA256 82f1e45e5886278a4c86ed15dfd90a84b7e43848c72537a235835c7557e8f8cd
 EBUILD groovy-1.6.8.ebuild 3944 RMD160 4bf209fe6145309dc828131080ced7df75e14612 SHA1 1f68d8286b14d9721b69db2305feabe6eb7e132d SHA256 34adf1728bab814f41211416e81ca99b4075dec0d0f0ce42090572e2c66c06c3
 EBUILD groovy-1.7.10.ebuild 3777 RMD160 34c3413dd0c5e642bfd24d7e112fa0b048d011ed SHA1 c74c4cc239e8ff4d280dff2f453796f824f1b8e9 SHA256 0876e3015aef0f3e4fbd97f352e58d40b0d60c4a0f765492f6de1eaf80a75bca
 EBUILD groovy-1.7.5.ebuild 3815 RMD160 6119ec963e04018bf1b4e23379117cfff93cc8b0 SHA1 c478b2f8aaf90dbf626b759acb97d437d39868a0 SHA256 53d45b070719378fe947fb74e17c3536297c6337ca61f95d905f1ffa594fe517
-MISC ChangeLog 7899 RMD160 7a335256715db809e1ffd279132e68d4e26e8def SHA1 6de0117cd4cabe8906a248f46db5a9d63d9dd9c2 SHA256 421add83d45f879a7d76d9843f5e0e02416dee6c84eaa0a3074f658581e9721a
+EBUILD groovy-1.8.5.ebuild 4046 RMD160 a722ef68d5d36f4f9eeaab2b655ca86057cf1118 SHA1 b2c1aadddffc1fc8675a35e26a8714eb222292ef SHA256 6573016d39c2063c32098c96dffab91a3c0cb8bd271fec3548ff323a0f354b98
+MISC ChangeLog 8083 RMD160 d053fadf6e20a506abb933684fad1dc91da370ea SHA1 02b303091d672fb35daa5e3707757b994e26f81d SHA256 292818b267d9bd68d3c7ac9b17172e449a094c6ca79f1fe70dc0d2bc329db1fc
 MISC metadata.xml 832 RMD160 94f02ba09f77885d708e36c4056a56565b440e27 SHA1 0298fa4dcead2f1f857d767535cc7b42679a4c59 SHA256 dca576bfd06f9afa4ecb0049225e32ed9263a1b1c5cbb44e807e5a06ee7f36b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk5GK8AACgkQIiMqcbOVdxRnwgP/ZAPP5fUqiUAuBgKiME3sdLd0
-Sbd1cQjSfcKVcyy2+PnDIxdn1PCcxqQhBYZ1HT2bgnouSh5p2DGzjOEl43D6E+VC
-/tL/vh5dLWtTuSDxmU0LEPpc44LT9UlXwZ6guh2+OkJxRBqe3z8mmzcVn94PgGRW
-kOD6VWcZpi2UENJXw/Y=
-=+5uD
------END PGP SIGNATURE-----
diff --git a/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch b/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch
new file mode 100644
index 000000000000..d857afffca1d
--- /dev/null
+++ b/dev-java/groovy/files/groovy-1.8-build-pref-locking-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/build.xml b/build.xml
+index ffca39c..07d93b9 100644
+--- a/build.xml
++++ b/build.xml
+@@ -830,6 +830,7 @@ $Date: 2012/01/28 09:43:04 $
+                 <path refid="toolsPath"/>

+                 <pathelement path="${mainClassesDirectory}"/>

+             </classpath>

++	    <jvmarg value="-Duser.home=${user.home}" />

+             <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>

+             <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/>

+             <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/>

diff --git a/dev-java/groovy/groovy-1.8.5.ebuild b/dev-java/groovy/groovy-1.8.5.ebuild
new file mode 100644
index 000000000000..75ad115bcceb
--- /dev/null
+++ b/dev-java/groovy/groovy-1.8.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.8.5.ebuild,v 1.1 2012/01/28 09:43:04 ali_bush 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 base 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 ~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
+	java-virtuals/servlet-api:2.4
+	>=dev-java/bsf-2.4
+	java-virtuals/jmx"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-ivy:2
+	doc? (
+		dev-java/qdox:1.12
+		dev-java/commons-logging
+	)
+	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}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8-build-pref-locking-fix.patch" )
+
+JAVA_PKG_BSFIX=""
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e 's/fullQualifiedName/fullyQualifiedName/g' \
+		src/tools/org/codehaus/groovy/tools/DocGenerator.groovy
+
+	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,servlet-api-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,commons-logging
+}
+
+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
+}