Groovy-1.6.3 version bump (#235272)

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

10 files changed, 250 insertions, 482 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index c2d112b7d345..805be2df258c 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/groovy
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.31 2009/03/29 16:40:07 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.32 2009/07/28 14:35:16 elvanor Exp $
+
+*groovy-1.6.3 (28 Jul 2009)
+
+  28 Jul 2009; Jean-Noël Rivasseau <elvanor@gmail.com>
+  -files/build.xml-1.0_rc01, -files/build.xml-1.0,
+  -files/groovy-1.0-compiler-exit-code.patch,
+  -files/groovy-1.0_rc01-compiler-exit-code.patch, -groovy-1.5.4-r1.ebuild,
+  +groovy-1.6.3.ebuild, +files/groovy-build.patch,
+  -files/groovy-build.xml.patch:
+  Version bump to 1.6.3 (#235272), implemented partly doc USE flag,
+  restricted tests, removed old ebuilds.
 
   29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -groovy-1.5.4.ebuild,
   groovy-1.5.4-r1.ebuild:
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 4a5f12564be4..ad1efd7ed833 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,19 +1,5 @@
------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
-AUX groovy-1.0_rc01-compiler-exit-code.patch 1298 RMD160 b03e55173ea0ff4e1ccece169d172b82d65af727 SHA1 ef45228ad25a704c4a9f08b43f7f4c519551a692 SHA256 1e95765f7b0919314049ab955eeb3e38b0cd17c2e5655f4bc1958f1fda6543d3
-AUX groovy-build.xml.patch 1395 RMD160 4dbfd5743c571210601490f5becd80cfc79a341d SHA1 cb1d95dc820bf7c7e1732e58d711fef3b7b138de SHA256 fad7b519993253ce60ca1cc2a251d8c151b4723393d1dede733c902d1debf8c5
-DIST groovy-src-1.5.4.zip 6899116 RMD160 377fd8c17fca44a5291ce3003214af8a9a3b61d7 SHA1 490f6b20b1ef7f6c6ca6047516b2a500114f00a3 SHA256 695051ab0117b8dba7e9eeef83cfe98901f62ba61cdf220bdea86604b2335263
-EBUILD groovy-1.5.4-r1.ebuild 3449 RMD160 d5437ab1cf7f5b629d0e7c76203715fb5cfbb97a SHA1 ad06da49df68df936016a515ba91b4de919219cb SHA256 0fd399187b11174346eed84983311b2b7201e056b24cff5c73aefab2dc56a300
-MISC ChangeLog 5368 RMD160 46f5bd1aa5cb7528e5ef5c510fc9d5828efe2884 SHA1 5b7e43dcd282f4ffe2ffc4ad248ac22fcde4a0a0 SHA256 329215a6f94d8b9cf496c9355654fa5e94581d9188b2a1f726240c19148f9a3e
+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
+EBUILD groovy-1.6.3.ebuild 3839 RMD160 4f3a4901343d7c99ae8b565025d85ffdea64dbf1 SHA1 1d910fa33ccc3c1d54d9be83c8f47edd9a2b34a8 SHA256 e87e7276e4fe975b4634890b195aad98ca25bde64d56857996049fa37b39b5b8
+MISC ChangeLog 5817 RMD160 cda48c621eb4a836bef023dc31132aa77a4d9d2c SHA1 12ccc40aa2e1a153f0d8835e4421c9aef1a1a4ea SHA256 4c7edad922f1ff057b39dd7f3b7ee7f75e464aba1293b1973a2e2798cb306369
 MISC metadata.xml 832 RMD160 94f02ba09f77885d708e36c4056a56565b440e27 SHA1 0298fa4dcead2f1f857d767535cc7b42679a4c59 SHA256 dca576bfd06f9afa4ecb0049225e32ed9263a1b1c5cbb44e807e5a06ee7f36b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknPpG8ACgkQcxLzpIGCsLSIwACbBpbT21IPaf8QDu+UM8rjLoe1
-7A4AoJiIwtoo1cxc02e31ZPJ/Nql5B0b
-=rXZV
------END PGP SIGNATURE-----
diff --git a/dev-java/groovy/files/build.xml-1.0 b/dev-java/groovy/files/build.xml-1.0
deleted file mode 100644
index 4384ac7ec8f3..000000000000
--- a/dev-java/groovy/files/build.xml-1.0
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0
-  on date January 4 2007, time 2343-->
-<project default="jar" name="groovy" basedir=".">
-  <!--Load local and user build preferences-->
-  <property file="build.properties"></property>
-  <property file="${user.home}/build.properties"></property>
-  <!--Build properties-->
-  <property name="defaulttargetdir" value="${basedir}/target"></property>
-  <property name="libdir" value="${defaulttargetdir}/lib"></property>
-  <property name="classesdir" value="${basedir}/target/classes"></property>
-  <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
-  <property name="testreportdir" value="${basedir}/target/test-reports"></property>
-  <property name="distdir" value="${basedir}/dist"></property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
-  <property name="final.name" value="groovy-1.0"></property>
-  <property name="proxy.host" value=""></property>
-  <property name="proxy.port" value=""></property>
-  <property name="proxy.username" value=""></property>
-  <property name="proxy.password" value=""></property>
-  <path id="build.classpath">
-  	<fileset dir="${libdir}" includes="**/*.jar"/>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}"></mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
-    </condition>
-    <!--Test if JUNIT is present in ANT classpath-->
-    <available property="Junit.present" classname="junit.framework.Test"></available>
-    <!--Test if user defined a proxy-->
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host"></isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
-        </not>
-      </and>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="">
-    <mkdir dir="${classesdir}"></mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/main"></pathelement>
-      </src>
-      <classpath refid="build.classpath"></classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="${basedir}/src/main">
-        <include name="**/*.properties"></include>
-        <include name="**/*.xml"></include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}"></delete>
-    <delete dir="${distdir}"></delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist"></mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures."></fail>
-  </target>
-  <target name="internal-test" depends="compile-tests">
-    <mkdir dir="${testreportdir}"></mkdir>
-    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value="."></sysproperty>
-      <formatter type="xml"></formatter>
-      <formatter usefile="false" type="plain"></formatter>
-      <classpath>
-        <path refid="build.classpath"></path>
-        <pathelement path="${testclassesdir}"></pathelement>
-        <pathelement path="${classesdir}"></pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/test">
-          <include name="**/Uber*.*"></include>
-          <exclude name="**/SignedJarTest.*"></exclude>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="junit-present" unless="Junit.present" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" depends="compile">
-    <mkdir dir="${testclassesdir}"></mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/test"></pathelement>
-      </src>
-      <classpath>
-        <path refid="build.classpath"></path>
-        <pathelement path="${classesdir}"></pathelement>
-      </classpath>
-    </javac>
-    <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/src/test">
-        <include name="**/*.properties"></include>
-        <include name="**/*.xml"></include>
-        <include name="**/*.xsd"></include>
-      </fileset>
-    </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/src/test">
-        <include name="**/*.*"></include>
-        <include name="**/groovy*"></include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="">
-    <mkdir dir="${javadocdir}"></mkdir>
-    <tstamp>
-      <format pattern="2003-yyyy" property="year"></format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  The Codehaus. All Rights Reserved."></property>
-    <property name="title" value="groovy 1.0 API"></property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/main" packagenames=".*">
-      <classpath>
-        <path refid="build.classpath"></path>
-      </classpath>
-    </javadoc>
-  </target>
-</project>
diff --git a/dev-java/groovy/files/build.xml-1.0_rc01 b/dev-java/groovy/files/build.xml-1.0_rc01
deleted file mode 100644
index 2382c339d35a..000000000000
--- a/dev-java/groovy/files/build.xml-1.0_rc01
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-RC-01
-  on date December 29 2006, time 0256-->
-<project default="jar" name="groovy" basedir=".">
-  <!--Load local and user build preferences-->
-  <property file="build.properties"></property>
-  <property file="${user.home}/build.properties"></property>
-  <!--Build properties-->
-  <property name="defaulttargetdir" value="${basedir}/target"></property>
-  <property name="libdir" value="${defaulttargetdir}/lib"></property>
-  <property name="classesdir" value="${basedir}/target/classes"></property>
-  <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
-  <property name="testreportdir" value="${basedir}/target/test-reports"></property>
-  <property name="distdir" value="${basedir}/dist"></property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
-  <property name="final.name" value="groovy-1.0-RC-01"></property>
-  <property name="proxy.host" value=""></property>
-  <property name="proxy.port" value=""></property>
-  <property name="proxy.username" value=""></property>
-  <property name="proxy.password" value=""></property>
-  <path id="build.classpath">
-  	<fileset dir="${libdir}" includes="**/*.jar"/>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}"></mkdir>
-    <!--Test if user defined a proxy-->
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host"></isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}"></equals>
-        </not>
-      </and>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="">
-    <mkdir dir="${classesdir}"></mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/main"></pathelement>
-      </src>
-      <classpath refid="build.classpath"></classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="${basedir}/src/main">
-        <include name="**/*.properties"></include>
-        <include name="**/*.xml"></include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}"></delete>
-    <delete dir="${distdir}"></delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist"></mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures."></fail>
-  </target>
-  <target name="internal-test" if="test" depends="junit-present,compile-tests">
-    <mkdir dir="${testreportdir}"></mkdir>
-    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value="."></sysproperty>
-      <formatter type="xml"></formatter>
-      <formatter usefile="false" type="plain"></formatter>
-      <classpath>
-        <path refid="build.classpath"></path>
-        <pathelement path="${testclassesdir}"></pathelement>
-        <pathelement path="${classesdir}"></pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/test">
-          <include name="**/Uber*.*"></include>
-          <exclude name="**/SignedJarTest.*"></exclude>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="junit-present" unless="test" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" if="test" depends="junit-present,compile">
-    <mkdir dir="${testclassesdir}"></mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/test"></pathelement>
-      </src>
-      <classpath>
-        <path refid="build.classpath"></path>
-        <pathelement path="${classesdir}"></pathelement>
-      </classpath>
-    </javac>
-    <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/src/test">
-        <include name="**/*.properties"></include>
-        <include name="**/*.xml"></include>
-        <include name="**/*.xsd"></include>
-      </fileset>
-    </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/src/test">
-        <include name="**/*.*"></include>
-        <include name="**/groovy*"></include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="">
-    <mkdir dir="${javadocdir}"></mkdir>
-    <tstamp>
-      <format pattern="2003-yyyy" property="year"></format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  The Codehaus. All Rights Reserved."></property>
-    <property name="title" value="groovy 1.0-RC-01 API"></property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/main" packagenames=".*">
-      <classpath>
-        <path refid="build.classpath"></path>
-      </classpath>
-    </javadoc>
-  </target>
-</project>
diff --git a/dev-java/groovy/files/groovy-1.0-compiler-exit-code.patch b/dev-java/groovy/files/groovy-1.0-compiler-exit-code.patch
deleted file mode 100644
index 18c5bb55ba4e..000000000000
--- a/dev-java/groovy/files/groovy-1.0-compiler-exit-code.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru groovy-1.0/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java groovy-1.0-patched/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
---- groovy-1.0/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java	2007-01-02 19:17:30.000000000 -0500
-+++ groovy-1.0-patched/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java	2007-01-05 00:02:45.000000000 -0500
-@@ -223,6 +223,7 @@
-         catch( Throwable e ) 

-         {

-             new ErrorReporter( e, displayStackTraceOnError ).write( System.err );

-+			System.exit(1);

-         }

-     }

-     

diff --git a/dev-java/groovy/files/groovy-1.0_rc01-compiler-exit-code.patch b/dev-java/groovy/files/groovy-1.0_rc01-compiler-exit-code.patch
deleted file mode 100644
index 29c7ce83d967..000000000000
--- a/dev-java/groovy/files/groovy-1.0_rc01-compiler-exit-code.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru groovy-1.0-JSR-06-orig/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java groovy-1.0-JSR-06/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java
---- groovy-1.0-JSR-06-orig/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java	2006-06-28 10:42:01.000000000 -0400
-+++ groovy-1.0-JSR-06/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java	2006-09-23 00:13:34.000000000 -0400
-@@ -223,6 +223,7 @@
-         catch( Throwable e ) 

-         {

-             new ErrorReporter( e, displayStackTraceOnError ).write( System.err );

-+            System.exit(1);

-         }

-     }

-     

-diff -ru groovy-1.0-JSR-06-orig/src/test/UberTestCase.java groovy-1.0-JSR-06/src/test/UberTestCase.java
---- groovy-1.0-JSR-06-orig/src/test/UberTestCase.java	2006-06-28 10:42:01.000000000 -0400
-+++ groovy-1.0-JSR-06/src/test/UberTestCase.java	2006-09-23 00:12:36.000000000 -0400
-@@ -17,7 +17,7 @@
- 

-         String osName = System.getProperty ( "os.name" ) ;

-         if ( osName.equals ( "Linux" ) || osName.equals ( "SunOS" ) ) {

--          suite.addTestSuite ( ExecuteTest_LinuxSolaris.class ) ;

-+//          suite.addTestSuite ( ExecuteTest_LinuxSolaris.class ) ;

-         }

-         else {

-           System.err.println ( "XXXXXX  No execute testsfor this OS.  XXXXXX" ) ;

diff --git a/dev-java/groovy/files/groovy-build.patch b/dev-java/groovy/files/groovy-build.patch
new file mode 100644
index 000000000000..94cce161a60a
--- /dev/null
+++ b/dev-java/groovy/files/groovy-build.patch
@@ -0,0 +1,113 @@
+diff -ur groovy-1.6.3/build.xml groovy-1.6.3-new/build.xml
+--- groovy-1.6.3/build.xml	2009-07-27 10:36:57.000000000 +0200
++++ groovy-1.6.3-new/build.xml	2009-07-27 10:45:48.000000000 +0200
+@@ -55,6 +55,10 @@
+         <istrue value="${skipFetch}"/>

+     </condition>

+ 

++    <condition property="_skipEmbeddable_">

++        <istrue value="${skipEmbeddable}"/>

++    </condition>

++    

+     <condition property="groovy.build.vm5">

+         <not>

+             <contains string="${ant.java.version}" substring="1.4"/>

+@@ -551,7 +555,7 @@
+               tofile="${targetDistDirectory}/groovy-jdk14-${groovyVersion}-sources.jar"/>

+     </target>

+ 

+-    <target name="-jarjarInit">

++    <target name="-jarjarInit" unless="_skipEmbeddable_">

+         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask">

+             <classpath>

+                 <fileset dir="${bootstrapDirectory}" includes="jarjar-*.jar"/>

+@@ -559,7 +563,7 @@
+         </taskdef>

+     </target>

+ 

+-    <target name="-createEmbeddableJar" depends="-jarjarInit" unless="testFailed">

++    <target name="-createEmbeddableJar" depends="-jarjarInit" unless="_skipEmbeddable_">

+         <delete dir="${stagingDirectory}" quiet="true"/>

+         <mkdir dir="${stagingDirectory}"/>

+         <unzip dest="${stagingDirectory}">

+@@ -839,6 +843,7 @@
+         <path id="groovydocpath">

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

+             <path refid="runtimePath"/>

++	    <path refid="toolsPath"/>

+             <path path="${java.class.path}"/>

+         </path>

+         <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>

+diff -ur groovy-1.6.3/config/ant/build-maven.xml groovy-1.6.3-new/config/ant/build-maven.xml
+--- groovy-1.6.3/config/ant/build-maven.xml	2009-07-27 10:36:57.000000000 +0200
++++ groovy-1.6.3-new/config/ant/build-maven.xml	2009-07-27 10:38:34.000000000 +0200
+@@ -58,7 +58,7 @@
+ 

+     <target name="-mavenInit" depends="-mavenTaskdef,-mavenPomDefinitions"/>

+ 

+-    <target name="-mavenTaskdef">

++    <target name="-mavenTaskdef" unless="_skipFetch_">

+         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">

+             <classpath>

+                 <fileset dir="${bootstrapDirectory}" includes="maven-ant-tasks-*.jar"/>

+@@ -66,7 +66,7 @@
+         </typedef>

+     </target>

+ 

+-    <target name="-mavenPomDefinitions">

++    <target name="-mavenPomDefinitions" unless="_skipFetch_">

+         <maven.pom file="pom.xml" id="groovy.pom"/>

+         <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>

+         <maven.pom file="${targetDirectory}/groovy-all.pom" id="groovy-all.pom"/>

+@@ -84,7 +84,7 @@
+         <!--<maven.pom file="${targetDirectory}/groovy-all-jdk14.pom" id="groovy-all-jdk14.pom"/>-->

+     </target>

+ 

+-    <target name="-fetchDependencies" depends="-mavenFetchAllModules,-copyLibraries"/>

++    <target name="-fetchDependencies" depends="-mavenFetchAllModules,-copyLibraries,-definePathsWithoutCopyingLibraries"/>

+ 

+     <target name="-mavenFetchAllModules" depends="-mavenInit" unless="_skipFetch_">

+         <fetch.maven.all.modules/>

+@@ -99,6 +99,27 @@
+         <definePath pathId="jdk14ExtrasPath" filesetId="fs.runtime.groovy-jdk14-extras" libdir="${extrasLibDirectory}"/>

+     </target>

+ 

++    <target name="-definePathsWithoutCopyingLibraries" if="_skipFetch_">

++        <path id="compilePath">

++            <fileset dir="${compileLibDirectory}" includes="**/*.jar"/>

++        </path>

++        <path id="runtimePath">

++	    <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/>

++        </path>

++        <path id="testLibPath">

++            <fileset dir="${testLibDirectory}" includes="**/*.jar"/>

++        </path>

++        <path id="toolsPath">

++            <fileset dir="${toolsLibDirectory}" includes="**/*.jar"/>

++        </path>

++        <path id="examplesPath">

++            <fileset dir="${examplesLibDirectory}" includes="**/*.jar"/>

++        </path>

++        <path id="jdk14ExtrasPath">

++            <fileset dir="${extrasLibDirectory}" includes="**/*.jar"/>

++        </path>

++    </target>	

++

+     <target name="-mavenDeployInit" depends="-mavenInit">

+         <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>

+     </target>

+diff -ur groovy-1.6.3/config/ant/build-setup.xml groovy-1.6.3-new/config/ant/build-setup.xml
+--- groovy-1.6.3/config/ant/build-setup.xml	2009-07-27 10:36:57.000000000 +0200
++++ groovy-1.6.3-new/config/ant/build-setup.xml	2009-07-27 10:35:08.000000000 +0200
+@@ -66,7 +66,11 @@
+         <sequential>

+             <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">

+                 <classpath refid="@{classpathref}"/>

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

+                 <arg value="@{target}"/>

++                <arg value="-DskipFetch=${skipFetch}"/>

++                <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>

++                <arg value="-DtoolsLibDirectory=${toolsLibDirectory}" />

+             </java>

+         </sequential>

+     </macrodef>

diff --git a/dev-java/groovy/files/groovy-build.xml.patch b/dev-java/groovy/files/groovy-build.xml.patch
deleted file mode 100644
index 88a3635425db..000000000000
--- a/dev-java/groovy/files/groovy-build.xml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.orig	2008-02-01 18:49:08.000000000 +0100
-+++ build.xml	2008-03-02 14:27:33.000000000 +0100
-@@ -70,7 +70,7 @@
-         </antlr>
-     </target>
- 
--    <target name="-init" depends="-fetchDependencies">
-+    <target name="-init">
-         <echo message="Java Runtime Environment version: ${java.version}"/>
-         <echo message="Java Runtime Environment vendor: ${java.vendor}"/>
-         <echo message="Ant version: ${ant.version}"/>
-@@ -143,7 +143,7 @@
-                deprecation="on" debug="yes" source="1.4" target="1.4" fork="true" classpathref="compilePath">
-                <exclude name="**/vmplugin/v5/**" unless="groovy.build.vm5"/>
-         </javac>
--        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${mainClassesDirectory}" classpathref="runtimePath"/>
-+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${mainClassesDirectory}" classpathref="compilePath"/>
-         <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" classpathref="compilePath"/>
-     </target>
- 
-@@ -391,7 +391,7 @@
-     </target>
- 
-     <target name="-actuallyCreateJars"
--            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
-+            depends="-makeManifest,-initializeJars,-createBaseJar"
-             unless="testFailed"/>
- 
-     <target name="-makeManifest">
diff --git a/dev-java/groovy/groovy-1.5.4-r1.ebuild b/dev-java/groovy/groovy-1.5.4-r1.ebuild
deleted file mode 100644
index 75d527a5e6ee..000000000000
--- a/dev-java/groovy/groovy-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.5.4-r1.ebuild,v 1.2 2009/03/29 16:40:07 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
-#
-
-EAPI="2"
-WANT_ANT_TASKS="ant-antlr ant-trax"
-
-inherit versionator java-pkg-2 java-ant-2
-
-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-2.7.7:0[java]
-	>=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
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_PKG_BSFIX=""
-
-java_prepare() {
-	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() {
-	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
-}
diff --git a/dev-java/groovy/groovy-1.6.3.ebuild b/dev-java/groovy/groovy-1.6.3.ebuild
new file mode 100644
index 000000000000..f249aff8730b
--- /dev/null
+++ b/dev-java/groovy/groovy-1.6.3.ebuild
@@ -0,0 +1,120 @@
+# 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.3.ebuild,v 1.1 2009/07/28 14:35:16 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
+	${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() {
+	epatch "${FILESDIR}/${PN}-build.patch"
+
+	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 -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
+}