Groovy-1.6.7 version bump.

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 9 insertions, 118 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index a4f46d037835..571888e16725 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/groovy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.35 2009/11/04 16:08:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.36 2009/12/08 02:10:15 elvanor Exp $
+
+*groovy-1.6.7 (08 Dec 2009)
+
+  08 Dec 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  -groovy-1.6.3.ebuild, +groovy-1.6.7.ebuild, -files/groovy-build.patch:
+  Groovy 1.6.7 version bump.
 
   04 Nov 2009; Markus Meier <maekke@gentoo.org> groovy-1.6.5.ebuild:
   amd64/x86 stable, bug #279873
diff --git a/dev-java/groovy/files/groovy-build.patch b/dev-java/groovy/files/groovy-build.patch
deleted file mode 100644
index 94cce161a60a..000000000000
--- a/dev-java/groovy/files/groovy-build.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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/groovy-1.6.3.ebuild b/dev-java/groovy/groovy-1.6.7.ebuild
index 3effdb6011c9..b62defafca8d 100644
--- a/dev-java/groovy/groovy-1.6.3.ebuild
+++ b/dev-java/groovy/groovy-1.6.7.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2009/08/07 07:23:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.6.7.ebuild,v 1.1 2009/12/08 02:10:15 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.
@@ -70,8 +70,6 @@ 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
@@ -90,7 +88,7 @@ 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" \
+	use doc && ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars="true" -DruntimeLibDirectory="target/lib/compile" \
 	 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
 }