Groovy-1.6.3 version bump (#235272)

(Portage version: 2.1.6.13/cvs/Linux i686)

6 files changed, 113 insertions, 330 deletions

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">