Partial fix for the groovyConsole problem.

5 files changed, 12 insertions, 173 deletions

diff --git a/dev-java/groovy/ChangeLog b/dev-java/groovy/ChangeLog
index 1183da9b18f2..9ebf9bcbd39e 100644
--- a/dev-java/groovy/ChangeLog
+++ b/dev-java/groovy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xmojo-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed unde the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.2 2004/05/05 21:33:29 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.3 2004/05/06 12:30:54 karltk Exp $
+
+  05 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  groovy-1.0_beta4-r1.ebuild: Silly oversight, now the groovyConsole
+  loads, but there are still some issued about activation, probably
+  a dep I forgot.
 
 *groovy-1.0_beta4-r1 (05 May 2004)
 
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 14e64c26f9ea..bf81e4f3f6dc 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,9 +1,8 @@
-MD5 c3e51afdb938b48908be3796a65cd2ad ChangeLog 686
+MD5 7ac1ef39ce39c35ca933a2760d103eb7 ChangeLog 899
 MD5 d24f57f20f31e6a9a7181d82f4cfc9b9 metadata.xml 831
-MD5 7002e57f01f3c4ca281e44375e7ac5fe groovy-1.0_beta4-r1.ebuild 3926
+MD5 c9783e70c511bcdbc007f633aa578830 groovy-1.0_beta4-r1.ebuild 3928
 MD5 753c300a10069380883f08a681248dfb groovy-1.0_beta4.ebuild 1885
+MD5 f015c8b43391b3f8803deba12707f518 files/basescript-1.0_beta4 3175
 MD5 81ed508672aae26b21b7aadfab3f3c9d files/digest-groovy-1.0_beta4 73
 MD5 7481ca6b947624d4f94dcddc9d04e25b files/build.xml-1.0_beta4 5427
-MD5 1e90eacb16c937dd48294cd485025731 files/basescript-1.0_beta4-r1 3178
-MD5 7481ca6b947624d4f94dcddc9d04e25b files/build.xml-1.0_beta4-r1 5427
 MD5 81ed508672aae26b21b7aadfab3f3c9d files/digest-groovy-1.0_beta4-r1 73
diff --git a/dev-java/groovy/files/basescript-1.0_beta4-r1 b/dev-java/groovy/files/basescript-1.0_beta4
index ce3fb89be469..06d78c705798 100644
--- a/dev-java/groovy/files/basescript-1.0_beta4-r1
+++ b/dev-java/groovy/files/basescript-1.0_beta4
@@ -6,7 +6,7 @@
 ##############################################################################
 
 ##
-## $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/files/basescript-1.0_beta4-r1,v 1.1 2004/05/05 21:33:29 karltk Exp $
+## $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/files/basescript-1.0_beta4,v 1.1 2004/05/06 12:30:54 karltk Exp $
 ##
 ## Modified for Gentoo by Karl Trygve Kalleberg <karltk@gentoo.org>
 ##
diff --git a/dev-java/groovy/files/build.xml-1.0_beta4-r1 b/dev-java/groovy/files/build.xml-1.0_beta4-r1
deleted file mode 100644
index be7639ede75c..000000000000
--- a/dev-java/groovy/files/build.xml-1.0_beta4-r1
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-beta-4
-  on date December 23 2003, time 1605-->
-
-<project default="jar" name="groovy" basedir=".">
-  <property name="defaulttargetdir" value="target">
-  </property>
-  <property name="libdir" value="target/lib">
-  </property>
-  <property name="classesdir" value="target/classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testreportdir" value="target/test-reports">
-  </property>
-  <property name="distdir" value="dist">
-  </property>
-  <property name="javadocdir" value="dist/docs/api">
-  </property>
-  <property name="final.name" value="groovy-1.0-beta-4">
-  </property>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </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="src/main">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-      </classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="src/main">
-        <include name="**/*.properties">
-        </include>
-        <include name="**/*.xml">
-        </include>
-      </fileset>
-    </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="src/test">
-        <include name="**/*.properties">
-        </include>
-        <include name="**/*.xml">
-        </include>
-        <include name="**/*.xsd">
-        </include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="target/${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="./" 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>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="src/test">
-          <include name="**/*Test.*">
-          </include>
-          <include name="**/*Bug.*">
-          </include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </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="src/test">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="jar">
-    <mkdir dir="${javadocdir}">
-    </mkdir>
-    <tstamp>
-      <format pattern="2003-yyyy" property="year">
-      </format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy; 2003 The Codehaus. All Rights Reserved.">
-    </property>
-    <property name="title" value="groovy 1.0-beta-4 API">
-    </property>
-    <javadoc bottom="Copyright &amp;copy; 2003 The Codehaus. All Rights Reserved." use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main" packagenames="groovy,org.codehaus.groovy.*">
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="target/${final.name}.jar">
-        </pathelement>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
-    </get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-    </unjar>
-  </target>
-</project>
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
index 5cd81d0c7d62..ec42db04a9da 100644
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.1 2004/05/05 21:33:29 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r1.ebuild,v 1.2 2004/05/06 12:30:54 karltk Exp $
 
 inherit java-pkg
 
@@ -72,7 +72,7 @@ src_compile() {
 		--classpath ../../target/classes/ \
 		groovy/ui/Console.groovy || die "Failed to invoke groovyc"
 
-	jar uf ../../target/groovy-1.0-beta-4.jar groovy/ui/Console.class || die "Failed to backpatch Console.class"
+	jar uf ../../target/groovy-1.0-beta-4.jar groovy/ui/Console*.class || die "Failed to backpatch Console*.class"
 }
 
 generate_script() {