Update xerces dep for upcoming 2.6 slotmove.

(Portage version: 2.1.2_rc2-r3)
 (Unsigned Manifest commit)

7 files changed, 8 insertions, 579 deletions

diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
index 3e14dfe283e1..3df29f40d3fd 100644
--- a/dev-java/groovy/Manifest
+++ b/dev-java/groovy/Manifest
@@ -1,37 +1,20 @@
-AUX basescript-1.0_beta4 3226 RMD160 65325524aa6b3a2fb0742887114009de9a5abeac SHA1 1dbf419100cf9e38c2ba8697bd3e185dd490743a SHA256 dc4f4ebaf4caaec1dcb147ec4120ad04c4b07d01f806af62a371284dd69a2364
-MD5 a96c05c052b1b1fdf35e81d3f499afc0 files/basescript-1.0_beta4 3226
-RMD160 65325524aa6b3a2fb0742887114009de9a5abeac files/basescript-1.0_beta4 3226
-SHA256 dc4f4ebaf4caaec1dcb147ec4120ad04c4b07d01f806af62a371284dd69a2364 files/basescript-1.0_beta4 3226
 AUX build.xml-1.0.06 11631 RMD160 08c909da44f03fa95ec79f0aa3f7b0cf78e5aa61 SHA1 d587d5eace573ff49f6177bb0b3f68de299aa9d3 SHA256 178d0fcf6a05db90c5c28baa1df09a7901e30acb32d12c22727f5f64e7bbeaa6
 MD5 aa692c2c93648100bdcbad2e9213525b files/build.xml-1.0.06 11631
 RMD160 08c909da44f03fa95ec79f0aa3f7b0cf78e5aa61 files/build.xml-1.0.06 11631
 SHA256 178d0fcf6a05db90c5c28baa1df09a7901e30acb32d12c22727f5f64e7bbeaa6 files/build.xml-1.0.06 11631
-AUX build.xml-1.0_beta4 5427 RMD160 f7231691d933eb50ce5d94ce75b87a1bf49be5fe SHA1 dd1b926adaa5be34c48f35bb02826d7dea35412b SHA256 b839f8bd8714d8e65658759141b82ed32eb1dccf3e20efa0590e5c0bfa5f3d59
-MD5 7481ca6b947624d4f94dcddc9d04e25b files/build.xml-1.0_beta4 5427
-RMD160 f7231691d933eb50ce5d94ce75b87a1bf49be5fe files/build.xml-1.0_beta4 5427
-SHA256 b839f8bd8714d8e65658759141b82ed32eb1dccf3e20efa0590e5c0bfa5f3d59 files/build.xml-1.0_beta4 5427
 AUX groovy-1.0.06-compiler-exit-code.patch 1391 RMD160 f59efe245caba5be33bd1f98855999bd12b46f9c SHA1 fb86146718d40ffb843a39c4888b2a06b7d33b90 SHA256 af35fea287ef6b13e1f7ea9a44a7e01b09362c7f7eb36ec067e6603d6dd460f5
 MD5 fa11cfef466f02d0fe5b0c264942b41b files/groovy-1.0.06-compiler-exit-code.patch 1391
 RMD160 f59efe245caba5be33bd1f98855999bd12b46f9c files/groovy-1.0.06-compiler-exit-code.patch 1391
 SHA256 af35fea287ef6b13e1f7ea9a44a7e01b09362c7f7eb36ec067e6603d6dd460f5 files/groovy-1.0.06-compiler-exit-code.patch 1391
-DIST groovy-1.0-beta-4-src.tar.gz 349710 RMD160 e7e20665686efebe6ed2835a6a7941220152ca1c SHA1 566120749da68a7930aa38aceef4437dad2acd05 SHA256 fc16950ec02a2ba8678e34905bc954bda5318e6be373d0165f461b88d8adbf37
 DIST groovy-1.0-jsr-06-src.tar.gz 915850 RMD160 ff355f9abd85b051e444a914f30712fd9dd610c5 SHA1 4e2b7577af9e573d845e2fc5af651dec257a8a61 SHA256 b64ef8f6c3c2f8e628a0ecc4a4983d3422b0241900eae2bc93deb0a467d64e51
-EBUILD groovy-1.0.06.ebuild 2700 RMD160 d1be98f8915edd6be3cb567071da34f57e28e67a SHA1 00e17c8a0f41fe5bfe05a2895bce1999cb4fcfde SHA256 b5388b8a658c77c90807dde2d31f983ec74c99ca63af68da5a4a7a1089fc1703
-MD5 8e6a861b5091e4b230bf16e369d9dc99 groovy-1.0.06.ebuild 2700
-RMD160 d1be98f8915edd6be3cb567071da34f57e28e67a groovy-1.0.06.ebuild 2700
-SHA256 b5388b8a658c77c90807dde2d31f983ec74c99ca63af68da5a4a7a1089fc1703 groovy-1.0.06.ebuild 2700
-EBUILD groovy-1.0_beta4-r1.ebuild 3846 RMD160 d8876fbb72d577a5661dd6787cc8320f9aab7e9d SHA1 4a4201e7cb409e69c1aa074e61182ea3f7eee1c4 SHA256 5fc2cd6f19ee74aa88a76403c35274c81e83c890b4a9a55f5b7ac2a4e24f02e8
-MD5 1c7ee5485d5395958598d82b3c11d33b groovy-1.0_beta4-r1.ebuild 3846
-RMD160 d8876fbb72d577a5661dd6787cc8320f9aab7e9d groovy-1.0_beta4-r1.ebuild 3846
-SHA256 5fc2cd6f19ee74aa88a76403c35274c81e83c890b4a9a55f5b7ac2a4e24f02e8 groovy-1.0_beta4-r1.ebuild 3846
-EBUILD groovy-1.0_beta4-r2.ebuild 4036 RMD160 b4fdc7a13f3c5ef41088e9924496850bb07d3443 SHA1 68c4d3fe3230ace686cb21c04c64e07b42c22b3d SHA256 1190895bb0af4ce0ca48da98340b5937871f9fb8eb678917a1d76d6525db2056
-MD5 0815858e58c2125866f16387be28478e groovy-1.0_beta4-r2.ebuild 4036
-RMD160 b4fdc7a13f3c5ef41088e9924496850bb07d3443 groovy-1.0_beta4-r2.ebuild 4036
-SHA256 1190895bb0af4ce0ca48da98340b5937871f9fb8eb678917a1d76d6525db2056 groovy-1.0_beta4-r2.ebuild 4036
-MISC ChangeLog 2596 RMD160 04a4982d3a0a149691b9003cd19b2a75bad68bc8 SHA1 c6344b871105d6afeb8a9e169358bd49de324bb1 SHA256 0a7390e07b14867bf41ba51bdb2b29162a6895b31d8d669efd85bd2e1a1352c5
-MD5 8f56584dc1839fc80aea919e3d310ac6 ChangeLog 2596
-RMD160 04a4982d3a0a149691b9003cd19b2a75bad68bc8 ChangeLog 2596
-SHA256 0a7390e07b14867bf41ba51bdb2b29162a6895b31d8d669efd85bd2e1a1352c5 ChangeLog 2596
+EBUILD groovy-1.0.06.ebuild 2700 RMD160 d250ac9d6daf92ac4c5290d57a87803dfd9a1762 SHA1 e61a5103a3eda7812a19f9211f6ed662e1137d27 SHA256 7563185ba1ea9067b108c06955542339793b48070fdc7a752e4062b767c45b61
+MD5 7ca829ccb598f88aa8eaa7fc50707f89 groovy-1.0.06.ebuild 2700
+RMD160 d250ac9d6daf92ac4c5290d57a87803dfd9a1762 groovy-1.0.06.ebuild 2700
+SHA256 7563185ba1ea9067b108c06955542339793b48070fdc7a752e4062b767c45b61 groovy-1.0.06.ebuild 2700
+MISC ChangeLog 2838 RMD160 b180d2eaf7e2963b8579199f295075e4af4fed10 SHA1 a90c5140ac3696fb8ce105791c99c33c4ce1a1b6 SHA256 0383e5a67ed5b50f378b19bc99d4c64e6eb3e862c02596d897ab4f3e84e9f686
+MD5 6e25fc378405aaaeb30a5b3a455919bc ChangeLog 2838
+RMD160 b180d2eaf7e2963b8579199f295075e4af4fed10 ChangeLog 2838
+SHA256 0383e5a67ed5b50f378b19bc99d4c64e6eb3e862c02596d897ab4f3e84e9f686 ChangeLog 2838
 MISC metadata.xml 831 RMD160 9f135737c19a6ec3f5a22cc6f05f4244f3f1dea4 SHA1 349f041d840aa74e16833a0ac37850f570cec27a SHA256 2f53542578ff9fd27149090937adf62898535640ab889582ada8e49eb4748018
 MD5 d24f57f20f31e6a9a7181d82f4cfc9b9 metadata.xml 831
 RMD160 9f135737c19a6ec3f5a22cc6f05f4244f3f1dea4 metadata.xml 831
@@ -39,9 +22,3 @@ SHA256 2f53542578ff9fd27149090937adf62898535640ab889582ada8e49eb4748018 metadata
 MD5 d4c45682ca6e69259f7902fd596476d1 files/digest-groovy-1.0.06 265
 RMD160 6b476984307ce0f512d8cd17b30b8673274def7f files/digest-groovy-1.0.06 265
 SHA256 b7b882b275d94fddf90deeb579859863f04a24f61cc9314f72d0b439b91da663 files/digest-groovy-1.0.06 265
-MD5 23ac722fba90c8b958011f3015836fe1 files/digest-groovy-1.0_beta4-r1 265
-RMD160 f88f71f7f4d8ea15f97ba00ce94940e280b0e029 files/digest-groovy-1.0_beta4-r1 265
-SHA256 13dfe562d17c64f8855a6c7812cfb362ad3d63906b6f0027661063755af033cd files/digest-groovy-1.0_beta4-r1 265
-MD5 23ac722fba90c8b958011f3015836fe1 files/digest-groovy-1.0_beta4-r2 265
-RMD160 f88f71f7f4d8ea15f97ba00ce94940e280b0e029 files/digest-groovy-1.0_beta4-r2 265
-SHA256 13dfe562d17c64f8855a6c7812cfb362ad3d63906b6f0027661063755af033cd files/digest-groovy-1.0_beta4-r2 265
diff --git a/dev-java/groovy/files/basescript-1.0_beta4 b/dev-java/groovy/files/basescript-1.0_beta4
deleted file mode 100644
index 3d4f402d8b46..000000000000
--- a/dev-java/groovy/files/basescript-1.0_beta4
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-##############################################################################
-##                                                                          ##
-##  Groovy JVM Bootstrap for UN*X                                           ##
-##                                                                          ##
-##############################################################################
-
-##
-## $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/files/basescript-1.0_beta4,v 1.3 2005/10/18 08:28:01 axxo Exp $
-##
-## Modified for Gentoo by Karl Trygve Kalleberg <karltk@gentoo.org>
-##
-
-PROGNAME=`basename "$0"`
-DIRNAME=`dirname "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-# External dependencies
-asm_classpath="@asm_classpath@"
-bsf_classpath="@bsf_classpath@"
-classworlds_classpath="@classworlds_classpath@"
-commons_cli_classpath="@commons_cli_classpath@"
-mockobjects_classpath="@mockobjects_classpath@"
-xerces_classpath="@xerces_classpath@"
-xmojo_classpath="@xmojo_classpath@"
-extra_classpath="@extra_classpath@"
-
-final_classpath="${asm_classpath}:${bsf_classpath}:${classworlds_classpath}:${commons_cli_classpath}:${mockobjects_classpath}:${xerces_classpath}:${xmojo_classpath}${extra_classpath}"
-
-GROOVY_HOME="@groovy-home@"
-
-warn() {
-    echo "${PROGNAME}: $*"
-}
-
-die() {
-    warn "$*"
-    exit 1
-}
-
-# Use default grok-classworlds config
-if [ -z "$CLASSWORLDS_CONF" ]; then
-    CLASSWORLDS_CONF="$GROOVY_HOME/conf/@scriptname@-classworlds.conf"
-fi
-
-# Determine the Java command to use to start the JVM
-if [ -z "$JAVACMD" ]; then
-    if [ -n "$JAVA_HOME" ]; then
-        if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-            # IBM's JDK on AIX uses strange locations for the executables
-            JAVACMD="$JAVA_HOME/jre/sh/java"
-        else
-            JAVACMD="$JAVA_HOME/bin/java"
-        fi
-    else
-        JAVACMD="java"
-    fi
-fi
-if [ ! -x "$JAVACMD" ]; then
-    die "JAVA_HOME is not defined correctly; can not execute: $JAVACMD"
-fi
-if [ -z "$JAVA_HOME" ] ; then
-    warn "JAVA_HOME environment variable is not set"
-fi
-
-# Increase the maximum file descriptors if we can
-if [ "$cygwin" = "false" ]; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ]; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then
-            # use the system max
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ]; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# Setup Profiler
-useprofiler=false
-if [ "x$PROFILER" != "x" ]; then
-    if [ -r "$PROFILER" ]; then
-        . $PROFILER
-        useprofiler=true
-    else
-        die "Profiler file not found: $PROFILER"
-    fi
-fi
-
-TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
-
-# Start the Profiler or the JVM
-if $useprofiler; then
-    runProfiler
-else
-    exec $JAVACMD $JAVA_OPTS \
-        -classpath "${final_classpath}" \
-        -Dprogram.name="$PROGNAME" \
-        -Dclassworlds.conf="$CLASSWORLDS_CONF" \
-        -Dgroovy.home="$GROOVY_HOME" \
-        -Dtools.jar="$TOOLS_JAR" \
-        org.codehaus.classworlds.Launcher "$@"
-fi
diff --git a/dev-java/groovy/files/build.xml-1.0_beta4 b/dev-java/groovy/files/build.xml-1.0_beta4
deleted file mode 100644
index be7639ede75c..000000000000
--- a/dev-java/groovy/files/build.xml-1.0_beta4
+++ /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/files/digest-groovy-1.0_beta4-r1 b/dev-java/groovy/files/digest-groovy-1.0_beta4-r1
deleted file mode 100644
index dbf66fc382c1..000000000000
--- a/dev-java/groovy/files/digest-groovy-1.0_beta4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9aac05cd0bfca996e34f079a90f4147c groovy-1.0-beta-4-src.tar.gz 349710
-RMD160 e7e20665686efebe6ed2835a6a7941220152ca1c groovy-1.0-beta-4-src.tar.gz 349710
-SHA256 fc16950ec02a2ba8678e34905bc954bda5318e6be373d0165f461b88d8adbf37 groovy-1.0-beta-4-src.tar.gz 349710
diff --git a/dev-java/groovy/files/digest-groovy-1.0_beta4-r2 b/dev-java/groovy/files/digest-groovy-1.0_beta4-r2
deleted file mode 100644
index dbf66fc382c1..000000000000
--- a/dev-java/groovy/files/digest-groovy-1.0_beta4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9aac05cd0bfca996e34f079a90f4147c groovy-1.0-beta-4-src.tar.gz 349710
-RMD160 e7e20665686efebe6ed2835a6a7941220152ca1c groovy-1.0-beta-4-src.tar.gz 349710
-SHA256 fc16950ec02a2ba8678e34905bc954bda5318e6be373d0165f461b88d8adbf37 groovy-1.0-beta-4-src.tar.gz 349710
diff --git a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild b/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
deleted file mode 100644
index 339ebdfb89a7..000000000000
--- a/dev-java/groovy/groovy-1.0_beta4-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.10 2005/12/11 20:31:53 nichoj Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/groovy/distributions/${PN}-1.0-beta-4-src.tar.gz"
-LICENSE="codehaus-groovy"
-SLOT="1"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc jikes"
-DEPEND=">=dev-java/xerces-2.6
-	>=dev-java/commons-cli-1.0-r3
-	>=dev-java/ant-1.5
-	=dev-java/junit-3.8*
-	=dev-java/asm-1.4.1*
-	>=dev-java/classworlds-1.0-r2
-	=dev-java/mockobjects-0.0*
-	=dev-java/bsf-2.3*
-	=dev-java/servletapi-2.4*
-	=dev-java/xmojo-bin-5.0*
-	jikes? ( dev-java/jikes )"
-# karltk:
-# xmojo-bin is a JMX provider, we should add a list of alternatives
-
-
-S=${WORKDIR}/${PN}-1.0-beta-4
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-
-	cd ${S}/target/lib
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from junit
-	java-pkg_jar-from asm-1.4.1
-	java-pkg_jar-from commons-cli-1
-	java-pkg_jar-from classworlds-1
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from mockobjects
-	java-pkg_jar-from xmojo-bin-5.0
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar
-
-	cd ${S}
-
-	# The original build.xml will only build on a MacOSX machine when you're
-	# logged in as jstrachan. I don't reckon many Gentoo users are...
-	cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
-
-	# This won't compile without an incestuous relationship with radeox.
-	rm -rf ${S}/src/main/org/codehaus/groovy/wiki
-}
-
-src_compile() {
-	local myconf
-	use jikes && myconf="${myconf} -Dbuild.compiler=jikes"
-
-	ant ${myconf} jar || die "Failed to compile jar"
-	if use doc ; then
-		ant javadoc || die "Failed to generate docs"
-	fi
-
-	# Generate command-line scripts
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		generate_script "$x" "${S}/src" ":${S}/target/classes"
-	done
-
-	mkdir src/lib
-	cd src/main
-	sh ${S}/groovyc 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"
-}
-
-generate_script() {
-	scriptname="${1}"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	asm_classpath="$(java-config -p asm-1.4.1)"
-	bsf_classpath="$(java-config -p bsf-2.3)"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	commons_cli_classpath="$(java-config -p commons-cli-1)"
-	mockobjects_classpath="$(java-config -p mockobjects)"
-	xerces_classpath="$(java-config -p xerces-2)"
-	xmojo_classpath="$(java-config -p xmojo-bin-5.0)"
-
-	if [[ -n ${2} ]]; then
-		local groovy_home="${2}"
-	else
-		local groovy_home="/usr/share/groovy-${SLOT}"
-	fi
-	sed -e "s;@scriptname@;${scriptname};" \
-		-e "s;@groovy-home@;${groovy_home};" \
-		-e "s;@classworlds_classpath@;${classworlds_classpath};" \
-		-e "s;@asm_classpath@;${asm_classpath};" \
-		-e "s;@bsf_classpath@;${bsf_classpath};" \
-		-e "s;@commons_cli_classpath@;${commons_cli_classpath};" \
-		-e "s;@mockobjects_classpath@;${mockobjects_classpath};" \
-		-e "s;@xerces_classpath@;${xerces_classpath};" \
-		-e "s;@xmojo_classpath@;${xmojo_classpath};" \
-		-e "s;@extra_classpath@;${3};" \
-		< ${FILESDIR}/basescript-${PV} \
-		> ${scriptname} || die "Failed to generate ${scriptname}"
-}
-
-src_install() {
-	java-pkg_dojar target/groovy-1.0-beta-4.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-
-	# Install configuration files
-	confdir=/usr/share/groovy-${SLOT}/conf
-	dodir ${confdir}
-	insinto ${confdir}
-	doins src/conf/{groovy,groovyc,groovysh,groovyConsole,grok}-classworlds.conf
-
-	# Install command-line scripts
-	exeinto /usr/bin
-
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		rm -f $x
-		generate_script $x
-		doexe $x || die "Failed to install ${x}"
-	done
-}
diff --git a/dev-java/groovy/groovy-1.0_beta4-r2.ebuild b/dev-java/groovy/groovy-1.0_beta4-r2.ebuild
deleted file mode 100644
index 2a869437f3d3..000000000000
--- a/dev-java/groovy/groovy-1.0_beta4-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.0_beta4-r2.ebuild,v 1.1 2006/08/26 14:52:56 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2
-
-
-MY_PV=${PV/_beta/-beta-}
-
-DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
-HOMEPAGE="http://groovy.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/groovy/distributions/${PN}-${MY_PV}-src.tar.gz"
-LICENSE="codehaus-groovy"
-SLOT="1"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-# karltk:
-# xmojo-bin is a JMX provider, we should add a list of alternatives
-
-# betelgeuse:
-# Looking at the project.xml, the deps could use some improvement
-COMMON_DEP="
-	=dev-java/asm-1.4.1*
-	=dev-java/bsf-2.3*
-	>=dev-java/commons-cli-1.0-r3
-	=dev-java/junit-3.8*
-	=dev-java/mockobjects-0.0*
-	=dev-java/servletapi-2.4*
-	>=dev-java/xerces-2.6
-	>=dev-java/classworlds-1.0-r2
-	=dev-java/xmojo-bin-5.0*
-"
-#	>=dev-java/xerces-2.6
-#	>=dev-java/classworlds-1.0-r2
-#	=dev-java/xmojo-bin-5.0*
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	>=dev-java/ant-core-1.6.2"
-
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-
-	mkdir -p ${S}/target/lib
-
-	cd ${S}/target/lib
-#	java-pkg_jar-from xerces-2
-	java-pkg_jar-from junit
-	java-pkg_jar-from asm-1.4.1
-	java-pkg_jar-from commons-cli-1
-#	java-pkg_jar-from classworlds-1
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from mockobjects
-#	java-pkg_jar-from xmojo-bin-5.0
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from servletapi-2.4 servlet-api.jar
-
-	cd ${S}
-
-	# The original build.xml will only build on a MacOSX machine when you're
-	# logged in as jstrachan. I don't reckon many Gentoo users are...
-	cp ${FILESDIR}/build.xml-${PV} ${S}/build.xml || die "Failed to update build.xml"
-
-	# This won't compile without an incestuous relationship with radeox.
-	rm -rf ${S}/src/main/org/codehaus/groovy/wiki
-}
-
-src_compile() {
-	eant $(use_doc) jar || die "Failed to compile jar"
-
-	# Generate command-line scripts
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		generate_script "$x" "${S}/src" ":${S}/target/classes"
-	done
-
-	mkdir src/lib
-	cd src/main
-	sh ${S}/groovyc groovy/ui/Console.groovy || die "Failed to invoke groovyc"
-
-	jar uf ../../target/${PN}-${MY_PV}.jar groovy/ui/Console*.class || die "Failed to backpatch Console*.class"
-}
-
-
-# Should migrate to dolauncher
-generate_script() {
-	scriptname="${1}"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	asm_classpath="$(java-config -p asm-1.4.1)"
-	bsf_classpath="$(java-config -p bsf-2.3)"
-	classworlds_classpath="$(java-config -p classworlds-1)"
-	commons_cli_classpath="$(java-config -p commons-cli-1)"
-	mockobjects_classpath="$(java-config -p mockobjects)"
-	xerces_classpath="$(java-config -p xerces-2)"
-	xmojo_classpath="$(java-config -p xmojo-bin-5.0)"
-
-	if [[ -n ${2} ]]; then
-		local groovy_home="${2}"
-	else
-		local groovy_home="/usr/share/groovy-${SLOT}"
-	fi
-	sed -e "s;@scriptname@;${scriptname};" \
-		-e "s;@groovy-home@;${groovy_home};" \
-		-e "s;@classworlds_classpath@;${classworlds_classpath};" \
-		-e "s;@asm_classpath@;${asm_classpath};" \
-		-e "s;@bsf_classpath@;${bsf_classpath};" \
-		-e "s;@commons_cli_classpath@;${commons_cli_classpath};" \
-		-e "s;@mockobjects_classpath@;${mockobjects_classpath};" \
-		-e "s;@xerces_classpath@;${xerces_classpath};" \
-		-e "s;@xmojo_classpath@;${xmojo_classpath};" \
-		-e "s;@extra_classpath@;${3};" \
-		< ${FILESDIR}/basescript-${PV} \
-		> ${scriptname} || die "Failed to generate ${scriptname}"
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}-${MY_PV}.jar
-
-	use doc && java-pkg_dohtml -r dist/docs/api
-
-	# Install configuration files
-	confdir=/usr/share/groovy-${SLOT}/conf
-	dodir ${confdir}
-	insinto ${confdir}
-	doins src/conf/{groovy,groovyc,groovysh,groovyConsole,grok}-classworlds.conf
-
-	# Install command-line scripts
-	exeinto /usr/bin
-
-	for x in grok groovy groovyc groovysh groovyConsole ; do
-		rm -f $x
-		generate_script $x
-		doexe $x || die "Failed to install ${x}"
-	done
-}