commit:     63552d7d7f16d597c4f022ecb4a7c6c1b02a8f2d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug  5 22:18:57 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 23:52:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=63552d7d

[dev-java/maven-*] Drop plexus rdep

 dev-java/maven-artifact/ChangeLog                  |  47 ------
 dev-java/maven-artifact/Manifest                   |   2 -
 .../maven-artifact-2.1_pre20071021.ebuild          |  50 ------
 dev-java/maven-artifact/metadata.xml               |   5 -
 dev-java/maven-build-context/ChangeLog             |  16 --
 dev-java/maven-build-context/Manifest              |   1 -
 .../maven-build-context-2.1_pre20071021.ebuild     |  32 ----
 dev-java/maven-build-context/metadata.xml          |   5 -
 dev-java/maven-core/ChangeLog                      |  57 -------
 dev-java/maven-core/Manifest                       |   1 -
 dev-java/maven-core/files/addsystemclasspath.patch | 106 ------------
 dev-java/maven-core/files/m2_classworlds.conf      |   6 -
 dev-java/maven-core/files/mvn-pre                  |  43 -----
 dev-java/maven-core/files/pom.properties           |   5 -
 .../maven-core/maven-core-2.1_pre20071021.ebuild   | 100 ------------
 dev-java/maven-core/metadata.xml                   |   5 -
 dev-java/maven-embedder/ChangeLog                  |  16 --
 dev-java/maven-embedder/Manifest                   |   1 -
 .../maven-embedder-2.1_pre20071021.ebuild          |  68 --------
 dev-java/maven-embedder/metadata.xml               |   6 -
 dev-java/maven-error-diagnostics/ChangeLog         |  29 ----
 dev-java/maven-error-diagnostics/Manifest          |   1 -
 .../maven-error-diagnostics-2.1_pre20070611.ebuild |  26 ---
 dev-java/maven-error-diagnostics/metadata.xml      |   5 -
 dev-java/maven-lifecycle/ChangeLog                 |  16 --
 dev-java/maven-lifecycle/Manifest                  |   2 -
 .../maven-lifecycle-2.1_pre20071021.ebuild         |  32 ----
 dev-java/maven-lifecycle/metadata.xml              |   5 -
 dev-java/maven-model-v3/ChangeLog                  |  34 ----
 dev-java/maven-model-v3/Manifest                   |   2 -
 dev-java/maven-model-v3/files/build-2.0.xml        |  90 ----------
 .../maven-model-v3-2.1_pre20071021-r2.ebuild       |  49 ------
 dev-java/maven-model-v3/metadata.xml               |   5 -
 dev-java/maven-model/ChangeLog                     |  29 ----
 dev-java/maven-model/Manifest                      |   2 -
 dev-java/maven-model/files/build-2.0.xml           |  90 ----------
 .../maven-model/maven-model-2.1_pre20071021.ebuild |  28 ----
 dev-java/maven-model/metadata.xml                  |   5 -
 dev-java/maven-plugin-api/ChangeLog                |  34 ----
 dev-java/maven-plugin-api/Manifest                 |   3 -
 .../maven-plugin-api-2.1_pre20070611.ebuild        |  21 ---
 .../maven-plugin-api-2.1_pre20071021.ebuild        |  38 -----
 dev-java/maven-plugin-api/metadata.xml             |   5 -
 dev-java/maven-plugin-descriptor/ChangeLog         |  29 ----
 dev-java/maven-plugin-descriptor/Manifest          |   2 -
 .../maven-plugin-descriptor-2.1_pre20070611.ebuild |  38 -----
 dev-java/maven-plugin-descriptor/metadata.xml      |   5 -
 .../maven-plugin-parameter-documenter/ChangeLog    |  33 ----
 .../maven-plugin-parameter-documenter/Manifest     |   2 -
 .../files/build-2.0.xml                            |  90 ----------
 ...gin-parameter-documenter-2.1_pre20070611.ebuild |  30 ----
 .../maven-plugin-parameter-documenter/metadata.xml |   5 -
 dev-java/maven-plugin-registry/ChangeLog           |   8 -
 dev-java/maven-plugin-registry/Manifest            |   2 -
 .../maven-plugin-registry-2.0.7_pre20071101.ebuild |  35 ----
 dev-java/maven-plugin-registry/metadata.xml        |   5 -
 dev-java/maven-plugins/ChangeLog                   |  22 ---
 dev-java/maven-plugins/Manifest                    |   2 -
 .../maven-plugins/files/maven-javadoc-plugin.diff  |  38 -----
 dev-java/maven-plugins/files/maven-war-plugin.diff |  16 --
 .../maven-plugins/files/plugin-testing-tools.patch |  16 --
 .../maven-plugins-2.1_pre20071021.ebuild           | 159 ------------------
 dev-java/maven-plugins/metadata.xml                |   5 -
 dev-java/maven-profile/ChangeLog                   |  34 ----
 dev-java/maven-profile/Manifest                    |   2 -
 .../maven-profile-2.1_pre20071021.ebuild           |  36 ----
 dev-java/maven-profile/metadata.xml                |   5 -
 dev-java/maven-project/ChangeLog                   |  41 -----
 dev-java/maven-project/Manifest                    |   1 -
 dev-java/maven-project/digest                      |   0
 dev-java/maven-project/files/cp.patch              | 118 --------------
 .../maven-project-2.1_pre20071021.ebuild           |  47 ------
 dev-java/maven-project/metadata.xml                |   5 -
 dev-java/maven-scm/ChangeLog                       |  12 --
 dev-java/maven-scm/Manifest                        |   2 -
 .../maven-scm/files/assemble-plexus-resources.sh   |  29 ----
 .../maven-scm-2.0_alpha3_pre20071026.ebuild        |  74 ---------
 dev-java/maven-scm/metadata.xml                    |   5 -
 dev-java/maven-script/ChangeLog                    |  33 ----
 dev-java/maven-script/Manifest                     |   1 -
 .../files/AntMojoComponentFactory.java.diff        |  15 --
 .../maven-script-2.1_pre20070611.ebuild            |  53 ------
 dev-java/maven-script/metadata.xml                 |   5 -
 dev-java/maven-settings/ChangeLog                  |  26 ---
 dev-java/maven-settings/Manifest                   |   2 -
 .../maven-settings-2.1_pre20070611.ebuild          |  38 -----
 dev-java/maven-settings/metadata.xml               |   5 -
 dev-java/maven-shared-components/ChangeLog         |  24 ---
 dev-java/maven-shared-components/Manifest          |   2 -
 .../files/maven-artifact.patch                     |  85 ----------
 .../files/plugin-testing-tools.patch               |  16 --
 .../maven-shared-components-2.1_pre20071021.ebuild | 132 ---------------
 dev-java/maven-shared-components/metadata.xml      |   5 -
 dev-java/maven/ChangeLog                           |  53 ------
 dev-java/maven/files/m2_classworlds.conf           |   7 -
 dev-java/maven/files/maven-2.1.pom                 |   9 -
 dev-java/maven/files/mvn                           |  53 ------
 dev-java/maven/files/settings.xml                  |  14 --
 dev-java/maven/maven-2.1-r1.ebuild                 | 180 --------------------
 dev-java/maven/maven-2.1.ebuild                    | 181 ---------------------
 dev-java/maven/metadata.xml                        |   5 -
 101 files changed, 3020 deletions(-)

diff --git a/dev-java/maven-artifact/ChangeLog 
b/dev-java/maven-artifact/ChangeLog
deleted file mode 100644
index e52d684..0000000
--- a/dev-java/maven-artifact/ChangeLog
+++ /dev/null
@@ -1,47 +0,0 @@
-# ChangeLog for dev-java/maven-artifact
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-artifact-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-artifact-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-artifact-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-artifact-2.1_pre20071021.ebuild:
-  update to use lastest deps
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-artifact-2.1_pre20070614.ebuild,
-  +maven-artifact-2.1_pre20071021.ebuild:
-  version bump
-
-  11 Jun 2007; kiorky <[email protected]>
-  -maven-artifact-2.1_pre20070603.ebuild,
-  +maven-artifact-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-artifact-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-artifact-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-artifact-2.0.ebuild:
-  Adding to ~amd64, Restricted tests
-
-  01 May 2007; kiorky <[email protected]> +maven-artifact-2.0.6.ebuild,
-  +metadata.xml:
-  Added as a maven dependency, #177474
-
-  01 May 2007; kiorky <[email protected]> ChangeLog:
-  Added as a maven dependency
-

diff --git a/dev-java/maven-artifact/Manifest b/dev-java/maven-artifact/Manifest
deleted file mode 100644
index 2194be2..0000000
--- a/dev-java/maven-artifact/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-artifact-2.1_pre20071021-gen-src.tar.bz2 7314 SHA256 
f7db80ba575bf463793c5f9f7d8c22d36c04470264697ad03ffbd1cca644cca0
-DIST maven-artifact-2.1_pre20071021.tar.bz2 95152 SHA256 
18e73b6ba62c1962060e232d1ebb871f6c9162f7a69be9d8f32edbcf39923034

diff --git a/dev-java/maven-artifact/maven-artifact-2.1_pre20071021.ebuild 
b/dev-java/maven-artifact/maven-artifact-2.1_pre20071021.ebuild
deleted file mode 100644
index 2883105..0000000
--- a/dev-java/maven-artifact/maven-artifact-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source" #no javadoc target
-
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="
->=dev-java/classworlds-1.1
-dev-java/plexus-classworlds
-dev-java/plexus-active-collections
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/wagon-provider-api
-dev-java/wagon-file
-dev-java/junit
-dev-java/easymock
-"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="
-classworlds-1.1
-plexus-classworlds
-plexus-active-collections
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-utils-1.4.7
-wagon-provider-api
-wagon-file
-easymock-1
-junit
-"
-
-RESTRICT=test
-
-
-# NOTE: the tests are merged with the compiled classes for plexus-compiler to 
build.
-# please adapt future build.xml when bumping
-

diff --git a/dev-java/maven-artifact/metadata.xml 
b/dev-java/maven-artifact/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-artifact/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-build-context/ChangeLog 
b/dev-java/maven-build-context/ChangeLog
deleted file mode 100644
index 657e284..0000000
--- a/dev-java/maven-build-context/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-# ChangeLog for dev-java/maven-build-context
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-build-context-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]>
-  +maven-build-context-2.1_pre20070611.ebuild, +digest, +metadata.xml:
-  Added as a maven dependency. See #181698
-

diff --git a/dev-java/maven-build-context/Manifest 
b/dev-java/maven-build-context/Manifest
deleted file mode 100644
index 19c9dea..0000000
--- a/dev-java/maven-build-context/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maven-build-context-2.1_pre20071021.tar.bz2 15744 SHA256 
8865bec563ccee79ae77a396878e33eae5d845a459e8ca2d1df6b9ea4438e746

diff --git 
a/dev-java/maven-build-context/maven-build-context-2.1_pre20071021.ebuild 
b/dev-java/maven-build-context/maven-build-context-2.1_pre20071021.ebuild
deleted file mode 100644
index d94e317..0000000
--- a/dev-java/maven-build-context/maven-build-context-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source doc"
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-plexus-container-default-1.0_alpha33
-plexus-utils-1.4.7
-plexus-component-api-1.0_alpha33
-"
-
-
-
-

diff --git a/dev-java/maven-build-context/metadata.xml 
b/dev-java/maven-build-context/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-build-context/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-core/ChangeLog b/dev-java/maven-core/ChangeLog
deleted file mode 100644
index 0640bdb..0000000
--- a/dev-java/maven-core/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-# ChangeLog for dev-java/maven-core
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-core-2.1_pre20071021.ebuild:
-  fix depends
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-core-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-core-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]>
-  -maven-core-2.0_pre20070530.ebuild, +maven-core-2.1_pre20070611.ebuild,
-  files/pom.properties:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]>
-  maven-core-2.0_pre20070530.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  02 Jun 2007; kiorky <[email protected]>
-  maven-core-2.0_pre20070530.ebuild:
-  slot correction
-
-  02 Jun 2007; kiorky <[email protected]> ChangeLog:
-  slot correction
-
-  02 Jun 2007; kiorky <[email protected]>
-  +maven-core-2.0_pre20070530.ebuild, -maven-core-2.0.ebuild,
-  +files/addsystemclasspath.patch:
-  bump to 2.0_pre20070530
-
-  29 May 2007; kiorky <[email protected]> maven-core-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  29 May 2007; kiorky <[email protected]> ChangeLog:
-  Adding maven bootstrap flag
-
-  26 May 2007; kiorky <[email protected]> maven-core-2.0.ebuild:
-  fix DEPEND
-
-  02 Mar 2007; kiorky <[email protected]>
-  +files/build.xml-core-1.0.2-r1, +files/build.xml-jelly-1.0.2-r1,
-  +files/build.xml-1.0.2-r1, +maven-core-1.0.2-r1.ebuild, +metadata.xml:
-  Adding as i must do something else for now
-      Will finnish later
-      It s maven related stuff
-

diff --git a/dev-java/maven-core/Manifest b/dev-java/maven-core/Manifest
deleted file mode 100644
index 9d5ec75..0000000
--- a/dev-java/maven-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maven-core-2.1_pre20071021.tar.bz2 2282917 SHA256 
9bb09f5df52433c79a99a8597b822c2393effcfc3529740285f393c8c4dbbc8f

diff --git a/dev-java/maven-core/files/addsystemclasspath.patch 
b/dev-java/maven-core/files/addsystemclasspath.patch
deleted file mode 100644
index e52ddf1..0000000
--- a/dev-java/maven-core/files/addsystemclasspath.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Index: 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/cli/MavenCli.java
-===================================================================
---- 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/cli/MavenCli.java     
   (révision 542776)
-+++ 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/cli/MavenCli.java     
   (copie de travail)
-@@ -674,6 +674,8 @@
- 
-         private static final String FAIL_NEVER = "fn";
- 
-+              private static final String USE_EXTERNAL_CLASSPATH = "cp";
-+
-         public CLIManager()
-         {
-             options = new Options();
-@@ -684,6 +686,9 @@
-             options.addOption(
-                 OptionBuilder.withLongOpt( "define" 
).hasArg().withDescription( "Define a system property" ).create(
-                     SET_SYSTEM_PROPERTY ) );
-+                      options.addOption(
-+                                      OptionBuilder.withLongOpt( 
"external-classpath" ).hasArg().withDescription( "Use system scope and external 
classpath" ).create(
-+                    USE_EXTERNAL_CLASSPATH ) );
-             options.addOption(
-                 OptionBuilder.withLongOpt( "offline" ).withDescription( "Work 
offline" ).create( OFFLINE ) );
-             options.addOption(
-Index: 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/DefaultMaven.java
-===================================================================
---- 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/DefaultMaven.java     
   (révision 542776)
-+++ 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/DefaultMaven.java     
   (copie de travail)
-@@ -288,12 +288,14 @@
- 
-         boolean foundProjects = true;
-         List projects = getProjects( request, globalProfileManager );
-+
-         if ( projects.isEmpty() )
-         {
-             projects.add( getSuperProject( request ) );
-             foundProjects = false;
-         }
- 
-+
-         ReactorManager rm;
-         try
-         {
-@@ -361,9 +363,13 @@
-         {
-             List files = getProjectFiles( request );
- 
-+
-+              System.out.println( "popo");  
-             projects = collectProjects( files, request.getLocalRepository(), 
request.isRecursive(),
-                                         request.getSettings(), 
globalProfileManager, !request.isReactorActive() );
- 
-+              System.out.println( "papa");  
-+
-         }
-         catch ( IOException e )
-         {
-@@ -450,6 +456,8 @@
-         throws ArtifactResolutionException, ProjectBuildingException, 
ProfileActivationException,
-         MavenExecutionException, BuildFailureException
-     {
-+
-+              System.out.println( "pipi");  
-         List projects = new ArrayList( files.size() );
- 
-         for ( Iterator iterator = files.iterator(); iterator.hasNext(); )
-@@ -464,13 +472,20 @@
-                 usingReleasePom = true;
-             }
- 
-+
-+
-+
-+              System.out.println( "pupu");  
-             MavenProject project = getProject( file, localRepository, 
settings, globalProfileManager );
-+              System.out.println( "pipi");  
- 
-+
-             if ( isRoot )
-             {
-                 project.setExecutionRoot( true );
-             }
- 
-+
-             if ( project.getPrerequisites() != null && 
project.getPrerequisites().getMaven() != null )
-             {
-                 DefaultArtifactVersion version = new DefaultArtifactVersion( 
project.getPrerequisites().getMaven() );
-@@ -481,6 +496,7 @@
-                 }
-             }
- 
-+
-             if ( project.getModules() != null && 
!project.getModules().isEmpty() && recursive )
-             {
-                 // TODO: Really should fail if it was not? What if it is 
aggregating - eg "ear"?
-Index: 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
-===================================================================
---- 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (révision 542776)
-+++ 
maven-core-2.0_pre20070530/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (copie de travail)
-@@ -1260,6 +1260,7 @@
-         for ( Iterator it = project.getArtifacts().iterator(); it.hasNext(); )
-         {
-             Artifact artifact = (Artifact) it.next();
-+                      System.out.println(artifact);  
- 
-             artifactResolver.resolve( artifact, remoteArtifactRepositories, 
localRepository );
-         }

diff --git a/dev-java/maven-core/files/m2_classworlds.conf 
b/dev-java/maven-core/files/m2_classworlds.conf
deleted file mode 100644
index 8ff6653..0000000
--- a/dev-java/maven-core/files/m2_classworlds.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
-
-set maven.home default ${user.home}/.m2
-
-[plexus.core]
-load /usr/share/maven-core-2/lib/maven-core.jar

diff --git a/dev-java/maven-core/files/mvn-pre 
b/dev-java/maven-core/files/mvn-pre
deleted file mode 100755
index ac544bb..0000000
--- a/dev-java/maven-core/files/mvn-pre
+++ /dev/null
@@ -1,43 +0,0 @@
-
-QUOTED_ARGS=""
-while [ "$1" != "" ] ; do
-
-       QUOTED_ARGS="$QUOTED_ARGS \"$1\""
-       shift
-
-done
-
-if [ -f /etc/mavenrc ] ; then
-       . /etc/mavenrc
-fi
-
-if [ -f "$HOME/.mavenrc" ] ; then
-       . "$HOME/.mavenrc"
-fi
-
-if [ -z "$M2_HOME" ] ; then
-       ## resolve links - $0 may be a link to maven's home
-       PRG="$0"
-
-       # need this for relative symlinks
-       while [ -h "$PRG" ] ; do
-               ls=`ls -ld "$PRG"`
-               link=`expr "$ls" : '.*-> \(.*\)$'`
-               if expr "$link" : '/.*' > /dev/null; then
-                       PRG="$link"
-               else
-                       PRG="`dirname "$PRG"`/$link"
-               fi
-       done
-
-       saveddir=`pwd`
-
-       M2_HOME=`dirname "$PRG"`/..
-
-       # make it fully qualified
-       M2_HOME=`cd "$M2_HOME" && pwd`
-
-       cd "$saveddir"
-       # echo Using m2 at $M2_HOME
-fi
-

diff --git a/dev-java/maven-core/files/pom.properties 
b/dev-java/maven-core/files/pom.properties
deleted file mode 100644
index 160dc3a..0000000
--- a/dev-java/maven-core/files/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed May 02 01:34:23 CEST 2007
-version=2.1-SNAPSHOT
-groupId=org.apache.maven.bootstrap
-artifactId=bootstrap-installer

diff --git a/dev-java/maven-core/maven-core-2.1_pre20071021.ebuild 
b/dev-java/maven-core/maven-core-2.1_pre20071021.ebuild
deleted file mode 100644
index abdf716..0000000
--- a/dev-java/maven-core/maven-core-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-utils-2 java-maven-2
-
-MY_PN=maven
-
-DESCRIPTION="The core of Maven"
-HOMEPAGE="http://maven.apache.org";
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${PF}.tar.bz2";
-LICENSE="Apache-2.0"
-COMMON_DEPS="
-=dev-java/classworlds-1.1*
-=dev-java/commons-cli-1*
-dev-java/commons-lang
-=dev-java/commons-lang-2.3*
-dev-java/commons-logging
-dev-java/doxia
-dev-java/maven-artifact
-dev-java/maven-build-context
-dev-java/maven-error-diagnostics
-dev-java/maven-lifecycle
-dev-java/maven-model
-dev-java/maven-monitor
-dev-java/maven-plugin-api
-dev-java/maven-plugin-descriptor
-dev-java/maven-plugin-parameter-documenter
-dev-java/maven-profile
-dev-java/plexus-interactivity-api
-dev-java/maven-project
-dev-java/maven-reporting
-dev-java/maven-settings
-dev-java/plexus-classworlds
-dev-java/plexus-active-collections
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/wagon-http-lightweight
-dev-java/wagon-provider-api
-dev-java/wagon-ssh
-dev-java/wagon-ssh-external
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}
-source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc source"
-SLOT="0"
-JAVA_MAVEN_CLASSPATH="
-classworlds-1.1
-commons-cli-1
-commons-lang-2.1
-commons-logging
-doxia
-maven-artifact
-maven-build-context
-maven-error-diagnostics
-maven-lifecycle
-maven-model
-maven-monitor
-maven-plugin-api
-maven-plugin-descriptor
-maven-plugin-parameter-documenter
-maven-profile
-maven-project
-maven-reporting
-maven-settings
-plexus-active-collections
-plexus-classworlds
-plexus-interactivity-api
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-plexus-utils-1.4.7
-wagon-http-lightweight
-wagon-provider-api
-wagon-ssh
-wagon-ssh-external
-"
-
-src_unpack() {
-       java-maven-2_src_unpack
-       mkdir -p "${S}/src/main/resources" || die
-       cp "${FILESDIR}/pom.properties" "${S}/src/main/resources" || die
-}
-
-src_install() {
-       java-maven-2_src_install
-
-       # default configuration
-       dodir "${JAVA_MAVEN_SYSTEM_HOME}"
-       insinto "${JAVA_MAVEN_SYSTEM_HOME}"
-       doins  "${S}/src/conf/settings.xml"
-
-       # create plugins and systtem repository directories
-       keepdir "${JAVA_MAVEN_SYSTEM_PLUGINS}"
-       keepdir "${JAVA_MAVEN_SYSTEM_REPOSITORY}"
-}
-

diff --git a/dev-java/maven-core/metadata.xml b/dev-java/maven-core/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-core/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-embedder/ChangeLog 
b/dev-java/maven-embedder/ChangeLog
deleted file mode 100644
index 89c3f20..0000000
--- a/dev-java/maven-embedder/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-# ChangeLog for dev-java/maven-embedder
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-embedder-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]> +files/build-1.9.xml,
-  +maven-embedder-2.1_pre20070529.ebuild:
-  commit -c -m Added as a maven dependency. See #181694
-

diff --git a/dev-java/maven-embedder/Manifest b/dev-java/maven-embedder/Manifest
deleted file mode 100644
index 8df4147..0000000
--- a/dev-java/maven-embedder/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maven-embedder-2.1_pre20071021.tar.bz2 411751 SHA256 
6d2736300b2c07177d0e6ce989c143ff6876d46f5cbe9a7c4e1b0fa2a7860916

diff --git a/dev-java/maven-embedder/maven-embedder-2.1_pre20071021.ebuild 
b/dev-java/maven-embedder/maven-embedder-2.1_pre20071021.ebuild
deleted file mode 100644
index ba0ef40..0000000
--- a/dev-java/maven-embedder/maven-embedder-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-
-JAVA_MAVEN_BOOTSTRAP="y"
-JAVA_PKG_IUSE="source doc"
-inherit java-maven-2
-
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2";
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
-=dev-java/commons-cli-1*
-=dev-java/jdom-1.0*
-dev-java/maven-artifact
-dev-java/maven-build-context
-dev-java/maven-core
-dev-java/maven-lifecycle
-dev-java/maven-model
-dev-java/maven-monitor
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/maven-plugin-api
-dev-java/maven-plugin-descriptor
-dev-java/maven-profile
-dev-java/maven-project
-dev-java/maven-settings
-dev-java/plexus-classworlds
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
-dev-java/wagon-file
-dev-java/wagon-http-lightweight
-dev-java/wagon-provider-api
-dev-java/wagon-ssh
-dev-java/wagon-ssh-external
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-
-JAVA_MAVEN_CLASSPATH="
-commons-cli-1
-jdom-1.0
-maven-artifact
-maven-build-context
-maven-core
-maven-lifecycle
-maven-model
-maven-monitor
-maven-plugin-api
-maven-plugin-descriptor
-maven-profile
-maven-project
-maven-settings
-plexus-classworlds
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-utils-1.4.7
-wagon-file
-wagon-http-lightweight
-wagon-provider-api
-wagon-ssh
-wagon-ssh-external
-"
-

diff --git a/dev-java/maven-embedder/metadata.xml 
b/dev-java/maven-embedder/metadata.xml
deleted file mode 100644
index 604e0a4..0000000
--- a/dev-java/maven-embedder/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <herd>java</herd>
-</pkgmetadata>
-

diff --git a/dev-java/maven-error-diagnostics/ChangeLog 
b/dev-java/maven-error-diagnostics/ChangeLog
deleted file mode 100644
index 76508ff..0000000
--- a/dev-java/maven-error-diagnostics/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-# ChangeLog for dev-java/maven-error-diagnostics
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-error-diagnostics-2.1_pre20070611.ebuild:
-  fix DEPENDS
-
-  11 Jun 2007; kiorky <[email protected]>
-  -maven-error-diagnostics-2.0.ebuild,
-  +maven-error-diagnostics-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]>
-  maven-error-diagnostics-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]>
-  maven-error-diagnostics-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-error-diagnostics-2.0.ebuild:
-  Adding to ~amd64.
-
-  01 May 2007; kiorky <[email protected]>
-  +maven-error-diagnostics-2.0.6.ebuild, +metadata.xml:
-  Added as a maven dependency, #177479
-

diff --git a/dev-java/maven-error-diagnostics/Manifest 
b/dev-java/maven-error-diagnostics/Manifest
deleted file mode 100644
index f30766f..0000000
--- a/dev-java/maven-error-diagnostics/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maven-error-diagnostics-2.1_pre20070611.tar.bz2 7053 SHA256 
1735312db178ac2076a0e3f20de82fa66ee19d7487d225c2486ac2a5c2d01527

diff --git 
a/dev-java/maven-error-diagnostics/maven-error-diagnostics-2.1_pre20070611.ebuild
 
b/dev-java/maven-error-diagnostics/maven-error-diagnostics-2.1_pre20070611.ebuild
deleted file mode 100644
index 4d3108e..0000000
--- 
a/dev-java/maven-error-diagnostics/maven-error-diagnostics-2.1_pre20070611.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source doc"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2";
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-"
-

diff --git a/dev-java/maven-error-diagnostics/metadata.xml 
b/dev-java/maven-error-diagnostics/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-error-diagnostics/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-lifecycle/ChangeLog 
b/dev-java/maven-lifecycle/ChangeLog
deleted file mode 100644
index 32f055c..0000000
--- a/dev-java/maven-lifecycle/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-# ChangeLog for dev-java/maven-lifecycle
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-lifecycle-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]>
-  +maven-lifecycle-2.1_pre20070611.ebuild, +metadata.xml:
-  Added as a maven dependency. See #181696
-

diff --git a/dev-java/maven-lifecycle/Manifest 
b/dev-java/maven-lifecycle/Manifest
deleted file mode 100644
index 7a760b5..0000000
--- a/dev-java/maven-lifecycle/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-lifecycle-2.1_pre20071021-gen-src.tar.bz2 9218 SHA256 
c74a0315197704eb0bbe670ff1ea8bc3c8ccca6d3253845a0837e41d55098bea
-DIST maven-lifecycle-2.1_pre20071021.tar.bz2 16631 SHA256 
1dd9480ecb2a7d7fc6dad5884c9857347cce5ce6c2d5fe65ed1229ec8b79d177

diff --git a/dev-java/maven-lifecycle/maven-lifecycle-2.1_pre20071021.ebuild 
b/dev-java/maven-lifecycle/maven-lifecycle-2.1_pre20071021.ebuild
deleted file mode 100644
index 731ce4f..0000000
--- a/dev-java/maven-lifecycle/maven-lifecycle-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source" #no javadoc target
-
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-utils-1.4.7
-"
-
-RESTRICT=test
-

diff --git a/dev-java/maven-lifecycle/metadata.xml 
b/dev-java/maven-lifecycle/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-lifecycle/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-model-v3/ChangeLog 
b/dev-java/maven-model-v3/ChangeLog
deleted file mode 100644
index 8480dbe..0000000
--- a/dev-java/maven-model-v3/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-# ChangeLog for dev-java/maven-model
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  31 Dec 2007; kiorky <[email protected]>
-  -maven-model-v3-2.1_pre20071021.ebuild,
-  +maven-model-v3-2.1_pre20071021-r2.ebuild:
-  -c udpate pom
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-model-v3-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  11 Jun 2007; kiorky <[email protected]> -maven-model-2.0.ebuild,
-  +maven-model-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-model-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-model-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  27 May 2007; kiorky <[email protected]> files/build-2.0.xml:
-  fix build.xml
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-model-2.0.ebuild:
-  Adding to ~amd64, Restricted tests
-
-  01 May 2007; kiorky <[email protected]> +maven-model-2.0.6.ebuild,
-  +files/build-2.0.6.xml, +metadata.xml:
-  Added as a maven dependency, #177480
-

diff --git a/dev-java/maven-model-v3/Manifest b/dev-java/maven-model-v3/Manifest
deleted file mode 100644
index 6ba89f6..0000000
--- a/dev-java/maven-model-v3/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-model-v3-2.1_pre20071021-r2-gen-src.tar.bz2 22871 SHA256 
419a34374ade4fafcc74324a3e42969405c8df23a7df7905018d96d8025aed1a
-DIST maven-model-v3-2.1_pre20071021-r2.tar.bz2 25347 SHA256 
ac70404c839e739d8dbb2c235bdac9c6892a7a9aee499ec1ec0a1661f59aef56

diff --git a/dev-java/maven-model-v3/files/build-2.0.xml 
b/dev-java/maven-model-v3/files/build-2.0.xml
deleted file mode 100644
index 3ea424f..0000000
--- a/dev-java/maven-model-v3/files/build-2.0.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project name="maven-model" default="jar" basedir=".">
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property name="maven.build.output" value="target/classes"/>
-  <property name="maven.build.directory" value="target"/>
-  <property name="maven.build.final.name" value="maven-model-2.0.7-SNAPSHOT"/>
-  <property name="maven.test.reports" 
value="${maven.build.directory}/test-reports"/>
-  <property name="maven.test.output" value="target/test-classes"/>
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <path id="build.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="classworlds/classworlds/1.1/classworlds-1.1.jar"/>
-      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
-      <include 
name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
-    </fileset>
-  </path>
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.directory}"/>
-  </target>
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.output}"/>
-    <javac destdir="${maven.build.output}" excludes="**/package.html" 
debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/main/java"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-  <target name="jar" depends="compile" description="Clean the JAR">
-    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" 
basedir="${maven.build.output}" excludes="**/package.html"/>
-  </target>
-  <target name="compile-tests" depends="junit-present, compile" 
description="Compile the test code" if="junit.present">
-    <mkdir dir="${maven.test.output}"/>
-    <javac destdir="${maven.test.output}" excludes="**/package.html" 
debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/test/java"/>
-      </src>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.test.output}">
-      <fileset dir="src/test/resources"/>
-    </copy>
-  </target>
-  <target name="test" depends="junit-present, compile-tests" 
if="junit.present" description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" 
fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-        <pathelement location="${maven.test.output}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="src/test/java">
-          <include name="**/*Test.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-  <target name="junit-present" depends="test-junit-present" 
unless="junit.present">
-    <echo>================================= WARNING 
================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not 
executed. </echo>
-    
<echo>==========================================================================</echo>
-  </target>
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${build.sysclasspath}" arg2="only"/>
-    </condition>
-  </target>
-  <target name="get-deps" depends="test-offline" description="Download all 
dependencies" unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar";
 dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/junit/junit/3.8.1/junit-3.8.1.jar";
 dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"; 
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-  </target>
-</project>

diff --git a/dev-java/maven-model-v3/maven-model-v3-2.1_pre20071021-r2.ebuild 
b/dev-java/maven-model-v3/maven-model-v3-2.1_pre20071021-r2.ebuild
deleted file mode 100644
index c0e7a9d..0000000
--- a/dev-java/maven-model-v3/maven-model-v3-2.1_pre20071021-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source" #No javadoc target
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-inherit java-maven-2
-
-
-# need it for -rx remove when bumping
-MVN_MOD_GEN_SRC="${PF}-gen-src.tar.bz2"
-BASE_URL="http://dev.gentooexperimental.org/~kiorky";
-SRC_URI="${BASE_URL}/${PF}.tar.bz2 ${BASE_URL}/${MVN_MOD_GEN_SRC}"
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
-=dev-java/jdom-1.0*
->=dev-java/plexus-utils-1.4.7_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-plexus-utils-1.4.7
-jdom-1.0
-"
-
-# need it for -rx remove when bumping
-RESTRICT=test
-
-# STEPS TO BUILD:
-# - co the src on the tag on the svn
-#     * 
http://svn.apache.org/repos/asf/maven/components/tags/maven-model-3.0.2/
-# - patch the pom to include the version for :
-#   * modify the artifact name to model-v3
-#   * jdom : 1.0
-#   * plexus-utils : 1.4.6
-# - mkdir src/main/java for ant:ant to include the compile step on the 
build.xml
-# - run maven -P all-models compile to generate the stuff (check the pom for
-#   adequat profile.)
-# - patch:
-#     * 
src/main/java/org/apache/maven/model/v3_0_0/io/jdom/MavenJDOMWriter.java
-# - rename the import org.apache.model.Model to org.apache.v3_0_0.model.Model

diff --git a/dev-java/maven-model-v3/metadata.xml 
b/dev-java/maven-model-v3/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-model-v3/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-model/ChangeLog b/dev-java/maven-model/ChangeLog
deleted file mode 100644
index 0babffb..0000000
--- a/dev-java/maven-model/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-# ChangeLog for dev-java/maven-model
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-model-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  11 Jun 2007; kiorky <[email protected]> -maven-model-2.0.ebuild,
-  +maven-model-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-model-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-model-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  27 May 2007; kiorky <[email protected]> files/build-2.0.xml:
-  fix build.xml
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-model-2.0.ebuild:
-  Adding to ~amd64, Restricted tests
-
-  01 May 2007; kiorky <[email protected]> +maven-model-2.0.6.ebuild,
-  +files/build-2.0.6.xml, +metadata.xml:
-  Added as a maven dependency, #177480
-

diff --git a/dev-java/maven-model/Manifest b/dev-java/maven-model/Manifest
deleted file mode 100644
index fdb3622..0000000
--- a/dev-java/maven-model/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-model-2.1_pre20071021-gen-src.tar.bz2 35459 SHA256 
50ae2613690fffaceb0b48786bda72a2d291e3c3e88cddf3a480780f64dc8c5a
-DIST maven-model-2.1_pre20071021.tar.bz2 127107 SHA256 
590e12c2513663b393fd50df2d65e37fc444316edb8f97e4c5c4c0f1b97f11a3

diff --git a/dev-java/maven-model/files/build-2.0.xml 
b/dev-java/maven-model/files/build-2.0.xml
deleted file mode 100644
index 3ea424f..0000000
--- a/dev-java/maven-model/files/build-2.0.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project name="maven-model" default="jar" basedir=".">
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property name="maven.build.output" value="target/classes"/>
-  <property name="maven.build.directory" value="target"/>
-  <property name="maven.build.final.name" value="maven-model-2.0.7-SNAPSHOT"/>
-  <property name="maven.test.reports" 
value="${maven.build.directory}/test-reports"/>
-  <property name="maven.test.output" value="target/test-classes"/>
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <path id="build.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="classworlds/classworlds/1.1/classworlds-1.1.jar"/>
-      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
-      <include 
name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
-    </fileset>
-  </path>
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.directory}"/>
-  </target>
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.output}"/>
-    <javac destdir="${maven.build.output}" excludes="**/package.html" 
debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/main/java"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-  <target name="jar" depends="compile" description="Clean the JAR">
-    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" 
basedir="${maven.build.output}" excludes="**/package.html"/>
-  </target>
-  <target name="compile-tests" depends="junit-present, compile" 
description="Compile the test code" if="junit.present">
-    <mkdir dir="${maven.test.output}"/>
-    <javac destdir="${maven.test.output}" excludes="**/package.html" 
debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/test/java"/>
-      </src>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.test.output}">
-      <fileset dir="src/test/resources"/>
-    </copy>
-  </target>
-  <target name="test" depends="junit-present, compile-tests" 
if="junit.present" description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" 
fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-        <pathelement location="${maven.test.output}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="src/test/java">
-          <include name="**/*Test.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-  <target name="junit-present" depends="test-junit-present" 
unless="junit.present">
-    <echo>================================= WARNING 
================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not 
executed. </echo>
-    
<echo>==========================================================================</echo>
-  </target>
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${build.sysclasspath}" arg2="only"/>
-    </condition>
-  </target>
-  <target name="get-deps" depends="test-offline" description="Download all 
dependencies" unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar";
 dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/junit/junit/3.8.1/junit-3.8.1.jar";
 dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"; 
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-  </target>
-</project>

diff --git a/dev-java/maven-model/maven-model-2.1_pre20071021.ebuild 
b/dev-java/maven-model/maven-model-2.1_pre20071021.ebuild
deleted file mode 100644
index 1eea064..0000000
--- a/dev-java/maven-model/maven-model-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source" #No javadoc target
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
-=dev-java/jdom-1.0*
->=dev-java/plexus-utils-1.4.7_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-plexus-utils-1.4.7
-jdom-1.0
-"
-
-RESTRICT=test

diff --git a/dev-java/maven-model/metadata.xml 
b/dev-java/maven-model/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-model/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-plugin-api/ChangeLog 
b/dev-java/maven-plugin-api/ChangeLog
deleted file mode 100644
index c0b1a9c..0000000
--- a/dev-java/maven-plugin-api/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-# ChangeLog for dev-java/maven-plugin-api
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-plugin-api-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-plugin-api-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]> -maven-plugin-api-2.0.ebuild,
-  +maven-plugin-api-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-plugin-api-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-plugin-api-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  13 May 2007; Alistair John Bush <[email protected]>
-  maven-plugin-api-2.0.ebuild:
-  Adding to ~amd64
-
-  01 May 2007; kiorky <[email protected]>
-  +maven-plugin-api-2.0.6.ebuild, +metadata.xml:
-  Added as a maven dependency, #177483
-

diff --git a/dev-java/maven-plugin-api/Manifest 
b/dev-java/maven-plugin-api/Manifest
deleted file mode 100644
index 917c7ba..0000000
--- a/dev-java/maven-plugin-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST maven-plugin-api-2.1_pre20070611.tar.bz2 10251 SHA256 
92a2dec36432b73e6cc977c2a56cd8f90ba154270b0f4dbb2ab940168c6d1303
-DIST maven-plugin-api-2.1_pre20071021-gen-src.tar.bz2 6098 SHA256 
e5877332052c75a04fd0cd38b713840a658845491a76c27f14782ff084ee016d
-DIST maven-plugin-api-2.1_pre20071021.tar.bz2 20589 SHA256 
aec23d37a23be9e49fe8ccfe99ee5cd358f4a47faafe02f0532c7bf2963a7c15

diff --git a/dev-java/maven-plugin-api/maven-plugin-api-2.1_pre20070611.ebuild 
b/dev-java/maven-plugin-api/maven-plugin-api-2.1_pre20070611.ebuild
deleted file mode 100644
index 1226ced..0000000
--- a/dev-java/maven-plugin-api/maven-plugin-api-2.1_pre20070611.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2";
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="dev-java/junit"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="junit"
-
-

diff --git a/dev-java/maven-plugin-api/maven-plugin-api-2.1_pre20071021.ebuild 
b/dev-java/maven-plugin-api/maven-plugin-api-2.1_pre20071021.ebuild
deleted file mode 100644
index a25c7b7..0000000
--- a/dev-java/maven-plugin-api/maven-plugin-api-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-JAVA_MAVEN_ADD_GENERATED_STUFF="Y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
-dev-java/plexus-classworlds
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/maven-artifact
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-dev-java/junit
-dev-java/maven-lifecycle
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-junit
-plexus-classworlds
-maven-artifact
-maven-lifecycle
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-"
-
-

diff --git a/dev-java/maven-plugin-api/metadata.xml 
b/dev-java/maven-plugin-api/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-plugin-api/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-plugin-descriptor/ChangeLog 
b/dev-java/maven-plugin-descriptor/ChangeLog
deleted file mode 100644
index 58eb061..0000000
--- a/dev-java/maven-plugin-descriptor/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-# ChangeLog for dev-java/maven-plugin-descriptor
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-plugin-descriptor-2.1_pre20070611.ebuild:
-  fix DEPENDS
-
-  11 Jun 2007; kiorky <[email protected]>
-  -maven-plugin-descriptor-2.0.ebuild,
-  +maven-plugin-descriptor-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]>
-  maven-plugin-descriptor-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]>
-  maven-plugin-descriptor-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-plugin-descriptor-2.0.ebuild:
-  Adding to ~amd64.
-
-  01 May 2007; kiorky <[email protected]>
-  +maven-plugin-descriptor-2.0.6.ebuild, +metadata.xml:
-  Added as a maven dependency, #177485
-

diff --git a/dev-java/maven-plugin-descriptor/Manifest 
b/dev-java/maven-plugin-descriptor/Manifest
deleted file mode 100644
index 40dbf25..0000000
--- a/dev-java/maven-plugin-descriptor/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-plugin-descriptor-2.1_pre20070611-gen-src.tar.bz2 5975 SHA256 
a734b10e933ad95acc34a9952ed84be0da7fb8731ef045c20d9cdc0ac92af5ef
-DIST maven-plugin-descriptor-2.1_pre20070611.tar.bz2 14702 SHA256 
92ef61de7e2bc01a2fa2aa705b220d98ee2953b85cc9ae532075416f78933e9e

diff --git 
a/dev-java/maven-plugin-descriptor/maven-plugin-descriptor-2.1_pre20070611.ebuild
 
b/dev-java/maven-plugin-descriptor/maven-plugin-descriptor-2.1_pre20070611.ebuild
deleted file mode 100644
index 463222e..0000000
--- 
a/dev-java/maven-plugin-descriptor/maven-plugin-descriptor-2.1_pre20070611.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source doc"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="
-=dev-java/classworlds-1.1*
-dev-java/maven-artifact
-dev-java/maven-plugin-api
-dev-java/plexus-classworlds
->=dev-java/plexus-utils-1.4.7_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-dev-java/xpp3
-"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="
-classworlds-1.1
-maven-artifact
-maven-plugin-api
-plexus-classworlds
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-xpp3
-"
-

diff --git a/dev-java/maven-plugin-descriptor/metadata.xml 
b/dev-java/maven-plugin-descriptor/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-plugin-descriptor/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-plugin-parameter-documenter/ChangeLog 
b/dev-java/maven-plugin-parameter-documenter/ChangeLog
deleted file mode 100644
index aa68e39..0000000
--- a/dev-java/maven-plugin-parameter-documenter/ChangeLog
+++ /dev/null
@@ -1,33 +0,0 @@
-# ChangeLog for dev-java/maven-plugin-parameter-documenter
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-plugin-parameter-documenter-2.1_pre20070611.ebuild:
-  fix depend to use current plexus stuff
-
-  11 Jun 2007; kiorky <[email protected]>
-  -maven-plugin-parameter-documenter-2.0.ebuild,
-  +maven-plugin-parameter-documenter-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]>
-  maven-plugin-parameter-documenter-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]>
-  maven-plugin-parameter-documenter-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  27 May 2007; kiorky <[email protected]> files/build-2.0.xml:
-  fix build.xml
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-plugin-parameter-documenter-2.0.ebuild:
-  Adding to ~amd64.
-
-  01 May 2007; kiorky <[email protected]>
-  +maven-plugin-parameter-documenter-2.0.6.ebuild, +files/build-2.0.6.xml,
-  +metadata.xml:
-  Added as a maven dependency, #177486
-

diff --git a/dev-java/maven-plugin-parameter-documenter/Manifest 
b/dev-java/maven-plugin-parameter-documenter/Manifest
deleted file mode 100644
index 3e7ebac..0000000
--- a/dev-java/maven-plugin-parameter-documenter/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-plugin-parameter-documenter-2.1_pre20070611-gen-src.tar.bz2 6009 
SHA256 66eb50aec405c4273cb24767510302b695f6509543a640bbb11cdd4af3739714
-DIST maven-plugin-parameter-documenter-2.1_pre20070611.tar.bz2 7339 SHA256 
11810417546374783faf6f62f3a4d71994f6f2be72fbdf3cb055c505f841c93f

diff --git a/dev-java/maven-plugin-parameter-documenter/files/build-2.0.xml 
b/dev-java/maven-plugin-parameter-documenter/files/build-2.0.xml
deleted file mode 100644
index b02d382..0000000
--- a/dev-java/maven-plugin-parameter-documenter/files/build-2.0.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project name="maven-plugin-parameter-documenter" default="jar" basedir=".">
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property name="maven.build.output" value="target/classes"/>
-  <property name="maven.build.directory" value="target"/>
-  <property name="maven.build.final.name" 
value="maven-plugin-parameter-documenter-2.0.7-SNAPSHOT"/>
-  <property name="maven.test.reports" 
value="${maven.build.directory}/test-reports"/>
-  <property name="maven.test.output" value="target/test-classes"/>
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <path id="build.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="classworlds/classworlds/1.1/classworlds-1.1.jar"/>
-      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
-      <include 
name="org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"/>
-    </fileset>
-  </path>
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.directory}"/>
-  </target>
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.output}"/>
-    <javac destdir="${maven.build.output}" excludes="**/package.html" 
debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/main/java"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-  <target name="jar" depends="compile" description="Clean the JAR">
-    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" 
basedir="${maven.build.output}" excludes="**/package.html"/>
-  </target>
-  <target name="compile-tests" depends="junit-present, compile" 
description="Compile the test code" if="junit.present">
-    <mkdir dir="${maven.test.output}"/>
-    <javac destdir="${maven.test.output}" excludes="**/package.html" 
debug="true" deprecation="true" optimize="false">
-      <src>
-        <pathelement location="src/test/java"/>
-      </src>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.test.output}">
-      <fileset dir="src/test/resources"/>
-    </copy>
-  </target>
-  <target name="test" depends="junit-present, compile-tests" 
if="junit.present" description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" 
fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${maven.build.output}"/>
-        <pathelement location="${maven.test.output}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="src/test/java">
-          <include name="**/*Test.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-  <target name="junit-present" depends="test-junit-present" 
unless="junit.present">
-    <echo>================================= WARNING 
================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not 
executed. </echo>
-    
<echo>==========================================================================</echo>
-  </target>
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${build.sysclasspath}" arg2="only"/>
-    </condition>
-  </target>
-  <target name="get-deps" depends="test-offline" description="Download all 
dependencies" unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1/classworlds-1.1.jar";
 dest="${maven.repo.local}/classworlds/classworlds/1.1/classworlds-1.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/junit/junit/3.8.1/junit-3.8.1.jar";
 dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/junit/junit/3.8.1/junit-3.8.1.jar";
 dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar"; 
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://people.apache.org/maven-snapshot-repository/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://snapshots.repository.codehaus.org/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-<get 
src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar";
 
dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.jar"
 usetimestamp="true" ignoreerrors="true"/>
-  </target>
-</project>

diff --git 
a/dev-java/maven-plugin-parameter-documenter/maven-plugin-parameter-documenter-2.1_pre20070611.ebuild
 
b/dev-java/maven-plugin-parameter-documenter/maven-plugin-parameter-documenter-2.1_pre20070611.ebuild
deleted file mode 100644
index bd3945c..0000000
--- 
a/dev-java/maven-plugin-parameter-documenter/maven-plugin-parameter-documenter-2.1_pre20070611.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source doc"
-
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="source doc"
-COMMON_DEPS="
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-utils-1.4.7
-"
-
-

diff --git a/dev-java/maven-plugin-parameter-documenter/metadata.xml 
b/dev-java/maven-plugin-parameter-documenter/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-plugin-parameter-documenter/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-plugin-registry/ChangeLog 
b/dev-java/maven-plugin-registry/ChangeLog
deleted file mode 100644
index e601f8f..0000000
--- a/dev-java/maven-plugin-registry/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for dev-java/maven-plugin-registry
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Nov 2007; kiorky <[email protected]>
-  +maven-plugin-registry-2.0.7_pre20071101.ebuild, +metadata.xml:
-  Added as a maven dependency, see #177487.
-

diff --git a/dev-java/maven-plugin-registry/Manifest 
b/dev-java/maven-plugin-registry/Manifest
deleted file mode 100644
index cce4f28..0000000
--- a/dev-java/maven-plugin-registry/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-plugin-registry-2.0.7_pre20071101-gen-src.tar.bz2 6761 SHA256 
5d3ca3027861664fd90fce0324e39fd75e0a8433bc6e05595012ecf99c13c711
-DIST maven-plugin-registry-2.0.7_pre20071101.tar.bz2 10584 SHA256 
6d19f9c871ebdf6521e20924f1f967c8623372ef951478776d04c877d65d3151

diff --git 
a/dev-java/maven-plugin-registry/maven-plugin-registry-2.0.7_pre20071101.ebuild 
b/dev-java/maven-plugin-registry/maven-plugin-registry-2.0.7_pre20071101.ebuild
deleted file mode 100644
index 8a702bc..0000000
--- 
a/dev-java/maven-plugin-registry/maven-plugin-registry-2.0.7_pre20071101.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source doc"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="
-=dev-java/classworlds-1.1*
-dev-java/maven-artifact
-dev-java/maven-plugin-api
->=dev-java/plexus-utils-1.4.7_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="
-classworlds-1.1
-maven-artifact
-maven-plugin-api
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-"
-

diff --git a/dev-java/maven-plugin-registry/metadata.xml 
b/dev-java/maven-plugin-registry/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-plugin-registry/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-plugins/ChangeLog b/dev-java/maven-plugins/ChangeLog
deleted file mode 100644
index ea50793..0000000
--- a/dev-java/maven-plugins/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-# ChangeLog for dev-java/maven-plugins
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-plugins-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-plugins-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-plugins-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  03 Nov 2007; kiorky <[email protected]>
-  +maven-plugins-2.1_pre20071021.ebuild, +files/maven-javadoc-plugin.diff,
-  +files/maven-war-plugin.diff, +files/plugin-testing-tools.patch,
-  +metadata.xml:
-  Added as a maven dependency, see #197947.
-

diff --git a/dev-java/maven-plugins/Manifest b/dev-java/maven-plugins/Manifest
deleted file mode 100644
index 6feb6b0..0000000
--- a/dev-java/maven-plugins/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-plugins-2.1_pre20071021-gen-src.tar.bz2 24717 SHA256 
f29d9d032998ca270dcd6d5c0fd42824be537b89af55236ec57107e4e2d8bf76
-DIST maven-plugins-2.1_pre20071021.tar.bz2 3872144 SHA256 
861907a531ffaea7661614ff7c46b88e3a48c7990bb29612964a796a7c6f465b

diff --git a/dev-java/maven-plugins/files/maven-javadoc-plugin.diff 
b/dev-java/maven-plugins/files/maven-javadoc-plugin.diff
deleted file mode 100644
index fafb1be..0000000
--- a/dev-java/maven-plugins/files/maven-javadoc-plugin.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: 
maven-plugins-2.1_pre20071021/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
-===================================================================
---- 
maven-plugins-2.1_pre20071021/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
        (révision 586908)
-+++ 
maven-plugins-2.1_pre20071021/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
        (copie de travail)
-@@ -34,6 +34,9 @@
- import java.util.List;
- import java.util.Locale;
- 
-+// gentoo-java patch
-+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
-+
- /**
-  * Generates documentation for the <code>Java code</code> in the project 
using the standard
-  * <a href="http://java.sun.com/j2se/javadoc/";>Javadoc Tool</a>.
-@@ -218,10 +221,14 @@
-     {
-         try
-         {
--            SiteRendererSink sink = siteRenderer.createSink( 
getReportOutputDirectory(), getOutputName() + ".html" );
-+            // gentoo-java patch
-+            // create sink doesnt exists anymore
-+            // siteRenderer.createSink( getReportOutputDirectory(), 
getOutputName() + ".html" );
-+            org.codehaus.doxia.sink.Sink sink = 
(org.codehaus.doxia.sink.Sink)  new SiteRendererSink( new 
RenderingContext(getReportOutputDirectory(), getOutputName() + ".html") );
- 
-             generate( sink, Locale.getDefault() );
-         }
-+        /* gentoo-java
-         catch ( RendererException e )
-         {
-             throw new MojoExecutionException( "An error has occurred in " + 
getName( Locale.ENGLISH )
-@@ -232,6 +239,7 @@
-             throw new MojoExecutionException( "An error has occurred in " + 
getName( Locale.ENGLISH )
-                 + " report generation:" + e.getMessage(), e );
-         }
-+        */
-         catch ( MavenReportException e )
-         {
-             throw new MojoExecutionException( "An error has occurred in " + 
getName( Locale.ENGLISH )

diff --git a/dev-java/maven-plugins/files/maven-war-plugin.diff 
b/dev-java/maven-plugins/files/maven-war-plugin.diff
deleted file mode 100644
index d318d59..0000000
--- a/dev-java/maven-plugins/files/maven-war-plugin.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: 
maven-plugins-2.1_pre20071021/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
-===================================================================
---- 
maven-plugins-2.1_pre20071021/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
   (révision 586908)
-+++ 
maven-plugins-2.1_pre20071021/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
   (copie de travail)
-@@ -257,11 +257,6 @@
-             unArchiver.setOverwrite( true );
-             unArchiver.extract();
-         }
--        catch ( IOException e )
--        {
--            throw new MojoExecutionException( "Error unpacking file[" + 
file.getAbsolutePath() + "]" + "to[" +
--                unpackDirectory.getAbsolutePath() + "]", e );
--        }
-         catch ( ArchiverException e )
-         {
-             throw new MojoExecutionException( "Error unpacking file[" + 
file.getAbsolutePath() + "]" + "to[" +

diff --git a/dev-java/maven-plugins/files/plugin-testing-tools.patch 
b/dev-java/maven-plugins/files/plugin-testing-tools.patch
deleted file mode 100755
index 7ed364c..0000000
--- a/dev-java/maven-plugins/files/plugin-testing-tools.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: 
maven-plugin-testing-tools-2.1_pre20070603.new/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
-===================================================================
---- 
maven-shared-components-2.1_pre20070615/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
   (révision 546838)
-+++ 
maven-shared-components-2.1_pre20070615/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
   (copie de travail)
-@@ -97,7 +97,7 @@
-         Settings settings;
-         try
-         {
--            settings = settingsBuilder.buildSettings();
-+            settings = settingsBuilder.buildSettings(null,null);
-         }
-         catch ( IOException e )
-         {
-
-
-

diff --git a/dev-java/maven-plugins/maven-plugins-2.1_pre20071021.ebuild 
b/dev-java/maven-plugins/maven-plugins-2.1_pre20071021.ebuild
deleted file mode 100644
index 06db0e4..0000000
--- a/dev-java/maven-plugins/maven-plugins-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source" #no javadoc target
-JAVA_MAVEN_BOOTSTRAP="Y"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-inherit java-maven-plugin-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
-dev-java/ant-core
-dev-java/ant-junit
-dev-java/antlr
->=dev-java/bsh-2.0_beta4-r2
-dev-util/checkstyle
-dev-java/commons-collections
->=dev-java/commons-httpclient-3
->dev-java/commons-lang-2.1
->dev-java/dom4j-1.4
-dev-java/easymock
-dev-java/gnu-javamail
-=dev-java/jaxen-1.1*
->=dev-java/jdom-1.0_beta10-r4
-dev-java/maven-plugin-registry
-dev-java/plexus-active-collections
-dev-java/plexus-archiver
-dev-java/plexus-cli
-dev-java/plexus-compiler
-dev-java/plexus-digest
-dev-java/plexus-i18n
-dev-java/plexus-interactivity-api
-dev-java/plexus-io
-dev-java/plexus-mail-sender
-dev-java/plexus-resources
-dev-java/plexus-velocity
-dev-java/saxpath
-dev-java/velocity
-dev-java/wagon-file
-dev-java/wagon-ftp
-dev-java/wagon-http
-dev-java/wagon-http-lightweight
-dev-java/wagon-http-shared
-dev-java/wagon-ssh
-dev-java/wagon-ssh-common
-dev-java/wagon-ssh-common-test
-dev-java/wagon-ssh-external
-dev-java/xalan
-dev-java/xml-commons
-dev-java/xstream
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-ant-core
-ant-junit
-antlr
-bsh
-checkstyle
-commons-collections
-commons-httpclient-3
-commons-httpclient-3
-commons-lang-2.1
-dom4j-1
-easymock-1
-gnu-javamail-1
-jaxen-1.1
-jdom-1.0
-maven-plugin-registry
-plexus-active-collections
-plexus-archiver
-plexus-cli
-plexus-compiler
-plexus-digest
-plexus-i18n
-plexus-interactivity-api
-plexus-io
-plexus-mail-sender
-plexus-resources
-plexus-velocity
-saxpath
-velocity
-wagon-file
-wagon-ftp
-wagon-http
-wagon-http-lightweight
-xstream
-wagon-http-shared
-wagon-ssh
-wagon-ssh-common
-wagon-ssh-common-test
-wagon-ssh-external
-xalan
-xml-commons
-"
-RESTRICT=test
-
-JAVA_MAVEN_PROJECTS="
-maven-ant-plugin
-maven-antrun-plugin
-maven-assembly-plugin
-maven-changes-plugin
-maven-clean-plugin
-maven-compiler-plugin
-maven-dependency-plugin
-maven-deploy-plugin
-maven-doap-plugin
-maven-docck-plugin
-maven-ear-plugin
-maven-ejb-plugin
-maven-gpg-plugin
-maven-install-plugin
-maven-invoker-plugin
-maven-jar-plugin
-maven-javadoc-plugin
-maven-one-plugin
-maven-patch-plugin
-maven-plugin-plugin
-maven-remote-resources-plugin
-maven-repository-plugin
-maven-resources-plugin
-maven-source-plugin
-maven-stage-plugin
-maven-toolchains-plugin
-maven-verifier-plugin
-maven-war-plugin
-"
-
-# NOTES:
-# those plugins are not packaged because i dont see them very used !
-# And they used not packaged deps/crappy one
-# So package them if only it is really neccesary
-# * maven-plugin-plugin  dont compile! strange errors
-# * maven-changelog-plugin  need maven-scm -> huge, can be done later
-# * maven-checkstyle-plugin  : depends on a very old doxia, we will certainly
-# not need it into our build system anyway as it is something to do reports
-# against code written...
-# * maven-eclipse-plugin  relying on bndlib, i suppose we ll not generated
-#  eclipse projects files when emerging ;)
-# * maven-help-plugin: not essential. do not build (api problems)
-# * maven-idea-plugin : api problems, same as eclipse plugin
-# maven-pmd-plugin  : api problem + lot of deps. This is for reporting, no need
-# to have it for systems compiles.
-# * maven-rar-plugin  needs MAVEN-SCM TODO: IMPORTANT TO PACKAGE THIS ONE
-# QUICKLY
-# * maven-site-plugin : we dont need reports and site plugins needs jetty stuff
-# ...
-# * maven-project-info-reports-plugin : no need  needs MAVEN-SCM
-
-
-JAVA_MAVEN_PATCHES="${FILESDIR}/maven-javadoc-plugin.diff 
${FILESDIR}/maven-war-plugin.diff"
-#JAVA_MAVEN_PATCHES="${FILESDIR}/maven-assembly-plugin.patch"
-

diff --git a/dev-java/maven-plugins/metadata.xml 
b/dev-java/maven-plugins/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-plugins/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-profile/ChangeLog b/dev-java/maven-profile/ChangeLog
deleted file mode 100644
index 3ccd040..0000000
--- a/dev-java/maven-profile/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-# ChangeLog for dev-java/maven-profile
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-profile-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-profile-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]> -maven-profile-2.0.ebuild,
-  +maven-profile-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-profile-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-profile-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-profile-2.0.ebuild:
-  Adding to ~amd64, Restricted tests
-
-  01 May 2007; kiorky <[email protected]> +maven-profile-2.0.6.ebuild,
-  +metadata.xml:
-  Added as a maven dependency, #177488
-

diff --git a/dev-java/maven-profile/Manifest b/dev-java/maven-profile/Manifest
deleted file mode 100644
index d4f1864..0000000
--- a/dev-java/maven-profile/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-profile-2.1_pre20071021-gen-src.tar.bz2 9376 SHA256 
4cdce90fb9fa12d7ab407fa82e47e1d9ac0875fe518f3f48a7ef2fa8990f6cb7
-DIST maven-profile-2.1_pre20071021.tar.bz2 10302 SHA256 
2c22891742ee732fcd77003164497c9bb41ab954c5d76fff3ea9f51c754c05b1

diff --git a/dev-java/maven-profile/maven-profile-2.1_pre20071021.ebuild 
b/dev-java/maven-profile/maven-profile-2.1_pre20071021.ebuild
deleted file mode 100644
index 1898969..0000000
--- a/dev-java/maven-profile/maven-profile-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source"
-
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="
-=dev-java/jdom-1.0*
-dev-java/maven-model
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="
-jdom-1.0
-maven-model
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-plexus-utils-1.4.7
-"
-
-RESTRICT=test
-

diff --git a/dev-java/maven-profile/metadata.xml 
b/dev-java/maven-profile/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-profile/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-project/ChangeLog b/dev-java/maven-project/ChangeLog
deleted file mode 100644
index 2602044..0000000
--- a/dev-java/maven-project/ChangeLog
+++ /dev/null
@@ -1,41 +0,0 @@
-# ChangeLog for dev-java/maven-project
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-project-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-project-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  21 Oct 2007; kiorky <[email protected]> ++:
-  -m bumped but i keep last version to be sure, waiting for the whole beast to
-  be recompiled one time entirely
-
-  11 Jun 2007; kiorky <[email protected]>
-  -maven-project-2.0_pre20070529.ebuild,
-  +maven-project-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]>
-  maven-project-2.0_pre20070529.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  02 Jun 2007; kiorky <[email protected]>
-  +maven-project-2.0_pre20070529.ebuild, -maven-project-2.0.ebuild, +digest,
-  +files/cp.patch:
-  bump to 2.0_pre20070530
-
-  29 May 2007; kiorky <[email protected]> maven-project-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-project-2.0.ebuild:
-  Adding to ~amd64.
-
-  01 May 2007; kiorky <[email protected]> +maven-project-2.0.6.ebuild,
-  +metadata.xml:
-  Added as a maven dependency, #177491
-

diff --git a/dev-java/maven-project/Manifest b/dev-java/maven-project/Manifest
deleted file mode 100644
index 502d426..0000000
--- a/dev-java/maven-project/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maven-project-2.1_pre20071021.tar.bz2 150288 SHA256 
023b3818de694b54a120ae42d3644888accb65345af621c51ff8103462107c86

diff --git a/dev-java/maven-project/digest b/dev-java/maven-project/digest
deleted file mode 100644
index e69de29..0000000

diff --git a/dev-java/maven-project/files/cp.patch 
b/dev-java/maven-project/files/cp.patch
deleted file mode 100644
index 62d0b30..0000000
--- a/dev-java/maven-project/files/cp.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: 
maven-project-2.0_pre20070529/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
-===================================================================
---- 
maven-project-2.0_pre20070529/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
       (révision 542962)
-+++ 
maven-project-2.0_pre20070529/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
       (copie de travail)
-@@ -476,9 +476,11 @@
-     {
-         Model model = readModel( "unknown", projectDescriptor, true );
- 
-+              System.out.println( "buildFromSourceFileInternal");
-         MavenProject project = buildInternal( 
projectDescriptor.getAbsolutePath(), model, localRepository,
-                                               buildArtifactRepositories( 
getSuperModel() ), projectDescriptor,
-                                               profileManager, true );
-+              System.out.println( "buildFromSourceFileInternal_"); 
- 
-         if ( checkDistributionManagementStatus )
-         {
-@@ -523,6 +525,9 @@
- 
-         try
-         {
-+
-+//            projectArtifact.setScope("system");
-+              System.out.println( "d"); 
-             artifactResolver.resolve( projectArtifact, 
remoteArtifactRepositories, localRepository );
- 
-             File file = projectArtifact.getFile();
-@@ -533,8 +538,12 @@
- 
-             ArtifactStatus status = ArtifactStatus.NONE;
- 
-+
-+              System.out.println( "b"); 
-             DistributionManagement distributionManagement = 
model.getDistributionManagement();
- 
-+              System.out.println( "c"); 
-+
-             if ( distributionManagement != null )
-             {
-                 downloadUrl = distributionManagement.getDownloadUrl();
-@@ -542,8 +551,11 @@
-                 status = ArtifactStatus.valueOf( 
distributionManagement.getStatus() );
-             }
- 
-+
-+              System.out.println( "a"); 
-             checkStatusAndUpdate( projectArtifact, status, file, 
remoteArtifactRepositories, localRepository );
- 
-+
-             // TODO: this is gross. Would like to give it the whole model, 
but maven-artifact shouldn't depend on that
-             // Can a maven-core implementation of the Artifact interface 
store it, and be used in the exceptions?
-             if ( downloadUrl != null )
-@@ -746,8 +758,10 @@
-         MavenProject project = null;
-         try
-         {
-+              System.out.println( "buildInternal"); 
-             project = assembleLineage( model, lineage, localRepository, 
projectDir, parentSearchRepositories,
-                                        aggregatedRemoteWagonRepositories, 
externalProfileManager, strict );
-+              System.out.println( "buildInternala"); 
-         }
-         catch ( InvalidRepositoryException e )
-         {
-@@ -1086,7 +1100,9 @@
-                 e.getMessage(), e );
-         }
- 
-+              System.out.println( "al");
-         MavenProject project = new MavenProject( model );
-+              System.out.println( "alb"); 
- 
-         project.setActiveProfiles( activeProfiles );
- 
-@@ -1224,6 +1240,7 @@
- 
-             Artifact parentArtifact = null;
- 
-+              System.out.println( "alc"); 
-             // only resolve the parent model from the repository system if we 
didn't find it on disk...
-             if ( model == null )
-             {
-@@ -1251,10 +1268,12 @@
-                         project.getId() + " from the repository." );
-                 }
- 
-+
-                 parentArtifact = artifactFactory.createParentArtifact( 
parentModel.getGroupId(),
-                                                                        
parentModel.getArtifactId(),
-                                                                        
parentModel.getVersion() );
- 
-+
-                 try
-                 {
-                     model = findModelFromRepository( parentArtifact, 
remoteRepositories, localRepository, false );
-@@ -1266,6 +1285,9 @@
-                 }
-             }
- 
-+                      
-+
-+              System.out.println( "alf"); 
-             if ( model != null && !"pom".equals( model.getPackaging() ) )
-             {
-                 throw new ProjectBuildingException( projectId, "Parent: " + 
model.getId() + " of project: " +
-@@ -1278,10 +1300,14 @@
-                 parentProjectDir = parentDescriptor.getParentFile();
-             }
- 
-+
-+              System.out.println( "ald"); 
-             MavenProject parent = assembleLineage( model, lineage, 
localRepository, parentProjectDir,
-                                                    parentSearchRepositories, 
aggregatedRemoteWagonRepositories,
-                                                    externalProfileManager, 
strict );
- 
-+
-+              System.out.println( "ale"); 
-             parent.setFile( parentDescriptor );
- 
-             project.setParent( parent );

diff --git a/dev-java/maven-project/maven-project-2.1_pre20071021.ebuild 
b/dev-java/maven-project/maven-project-2.1_pre20071021.ebuild
deleted file mode 100644
index 6f1b7ad..0000000
--- a/dev-java/maven-project/maven-project-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="source doc"
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEP="
-dev-java/maven-artifact
-dev-java/maven-build-context
-dev-java/maven-profile
-dev-java/maven-settings
->=dev-java/plexus-utils-1.4.7_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-dev-java/maven-model
-dev-java/wagon-provider-api
-dev-java/plexus-classworlds
-"
-DEPEND=">=virtual/jdk-1.4 ${DEP}"
-RDEPEND=">=virtual/jre-1.4 ${DEP}"
-JAVA_MAVEN_CLASSPATH="
-maven-model
-maven-artifact
-maven-build-context
-maven-profile
-maven-settings
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-plexus-classworlds
-wagon-provider-api
-"
-
-
-#JAVA_MAVEN_PATCHES="${FILESDIR}/cp.patch"
-
-

diff --git a/dev-java/maven-project/metadata.xml 
b/dev-java/maven-project/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-project/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-scm/ChangeLog b/dev-java/maven-scm/ChangeLog
deleted file mode 100644
index ab3868e..0000000
--- a/dev-java/maven-scm/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-# ChangeLog for dev-java/maven-scm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Jan 2009; Alistair Bush <[email protected]>
-  maven-scm-2.0_alpha3_pre20071026.ebuild:
-  Drop keywords as missing deps.
-
-  026 October 2007; pcolot <[email protected]> 
+maven-scm-2.1_pre20070529.ebuild,
-  +metadata.xml:
-  Added as a maven dependency
-

diff --git a/dev-java/maven-scm/Manifest b/dev-java/maven-scm/Manifest
deleted file mode 100644
index f620f79..0000000
--- a/dev-java/maven-scm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-scm-2.0_alpha3_pre20071026-gen-src.tar.bz2 10400 SHA256 
67dd243a80a94088e134ebf8f324efd657fc4e96e6f216aefe5d354251c767fe
-DIST maven-scm-2.0_alpha3_pre20071026.tar.bz2 878023 SHA256 
4dbf12fbdf51f27f4bdf58d57a76939c33a3e4b6fa7cf593b82b1a456d411430

diff --git a/dev-java/maven-scm/files/assemble-plexus-resources.sh 
b/dev-java/maven-scm/files/assemble-plexus-resources.sh
deleted file mode 100755
index 62aedb1..0000000
--- a/dev-java/maven-scm/files/assemble-plexus-resources.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# use to facilitate resources tarballing after generating them
-# enjoy :p
-
-assemble() {
-       local dest=titi
-       mkdir dest
-       for i in $(find . -name generated-resources|sed -re 
"s:(/target)|(\./)::g");
-       do
-               local maven_dest="$dest/$(dirname $i)/src/main"
-               echo assemble "$i"
-               mkdir -p  "$maven_dest"
-               cp -rf \
-               "$(echo $i|sed -re 
"s:generated-resources:target/generated-resources:g")/plexus" \
-               "$maven_dest/resources"
-       done
-       for i in $(find . -name generated-sources|sed -re 
"s:(/target)|(\./)::g");
-       do
-               local maven_dest="$dest/$(dirname $i)/src/main"
-               echo assemble "$i"
-               mkdir -p  "$maven_dest"
-               cp -rf \
-               "$(echo $i|sed -re 
"s:generated-sources:target/generated-sources:g")/modello" \
-               "$maven_dest/java"
-       done 
-}
-
-assemble
-

diff --git a/dev-java/maven-scm/maven-scm-2.0_alpha3_pre20071026.ebuild 
b/dev-java/maven-scm/maven-scm-2.0_alpha3_pre20071026.ebuild
deleted file mode 100644
index aa46271..0000000
--- a/dev-java/maven-scm/maven-scm-2.0_alpha3_pre20071026.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="y"
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-#MY_BASE_URL="http://dev.gentooexperimental.org/~kiorky";
-#MY_BASE_URL="http://localhost";
-#SRC_URI="${MY_BASE_URL}/${P}.tar.bz2 ${MY_BASE_URL}/${P}-gen-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="source doc"
-COMMON_DEPS="
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/junit
-=dev-java/jakarta-regexp-1.4
-dev-java/ganymed-ssh2
-dev-java/maven-project
-dev-java/maven-settings
-dev-java/maven-plugin-api
-"
-## TEST ant-apache-regexp is usefull ?
-## ADD cvsclient from org.netbeans.lib
-## ADD maven-plugin-testing-harness from org.apache.maven.shared
-
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-
-JAVA_MAVEN_CLASSPATH="
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-plexus-utils-1.4.7
-jakarta-regexp-1.4
-ganymed-ssh2
-maven-project
-maven-settings
-maven-plugin-api
-junit
-"
-
-## TEST ant-apache-regexp is usefull ?
-
-# PLEASE KEEP  THE ORDER !
-JAVA_MAVEN_PROJECTS="
-maven-scm-api
-maven-scm-managers/maven-scm-manager-plexus
-maven-scm-test
-maven-scm-providers/maven-scm-provider-local
-maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvstest
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsexe
-maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava
-maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest
-maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe
-maven-scm-providers/maven-scm-provider-vss
-maven-scm-providers/maven-scm-provider-perforce
-maven-scm-providers/maven-scm-provider-hg
-maven-scm-providers/maven-scm-provider-bazaar
-maven-scm-providers/maven-scm-provider-starteam
-maven-scm-providers/maven-scm-provider-synergy
-maven-scm-providers/maven-scm-provider-clearcase
-maven-scm-plugin
-maven-scm-client
-maven-scm-site
-"

diff --git a/dev-java/maven-scm/metadata.xml b/dev-java/maven-scm/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-scm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-script/ChangeLog b/dev-java/maven-script/ChangeLog
deleted file mode 100644
index d7c34c8..0000000
--- a/dev-java/maven-script/ChangeLog
+++ /dev/null
@@ -1,33 +0,0 @@
-# ChangeLog for dev-java/maven-script
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-script-2.1_pre20070611.ebuild:
-  fix DEPENDS
-
-  13 Jun 2007; kiorky <[email protected]>
-  maven-script-2.1_pre20070611.ebuild:
-  cleanup / not used
-
-  11 Jun 2007; kiorky <[email protected]> -maven-script-2.0.ebuild,
-  +maven-script-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-script-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-script-2.0.ebuild:
-  renaming EMAVEN_PROJECTS
-
-  29 May 2007; kiorky <[email protected]> maven-script-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  25 May 2007; kiorky <[email protected]> maven-script-2.0.ebuild,
-  files/AntMojoComponentFactory.java.diff:
-  fixing patches
-
-  07 May 2007; kiorky <[email protected]> +maven-script-2.0.6.ebuild,
-  +files/AntMojoComponentFactory.java.diff, +metadata.xml:
-  Added as a maven dependency, #177497
-

diff --git a/dev-java/maven-script/Manifest b/dev-java/maven-script/Manifest
deleted file mode 100644
index 45fceac..0000000
--- a/dev-java/maven-script/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maven-script-2.1_pre20070611.tar.bz2 10298 SHA256 
fd41e10c38b4cae6a572f138b6fe17b9e94bed189ac05aa4097cb258f0760d4f

diff --git a/dev-java/maven-script/files/AntMojoComponentFactory.java.diff 
b/dev-java/maven-script/files/AntMojoComponentFactory.java.diff
deleted file mode 100644
index 401af28..0000000
--- a/dev-java/maven-script/files/AntMojoComponentFactory.java.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur 
maven-script-2.0/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
 
new/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
---- 
maven-script-2.0/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
   2007-05-08 13:26:13.000000000 +0200
-+++ 
new/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
        2007-05-25 19:24:47.894856172 +0200
-@@ -30,7 +30,7 @@
-     extends AntComponentFactory
- {
- 
--    public Object newInstance( ComponentDescriptor descriptor, ClassRealm 
realm, PlexusContainer container )
-+    public Object newInstance( ComponentDescriptor descriptor, 
org.codehaus.plexus.classworlds.realm.ClassRealm  realm, PlexusContainer 
container )
-         throws ComponentInstantiationException
-     {
-         return new AntMojoWrapper( (AntScriptInvoker) super.newInstance( 
descriptor, realm, container ) );
-Seulement dans new/maven-script-ant/src/main/resources/META-INF: maven
-Seulement dans new/maven-script-beanshell/src/main: resources
-Seulement dans new: src

diff --git a/dev-java/maven-script/maven-script-2.1_pre20070611.ebuild 
b/dev-java/maven-script/maven-script-2.1_pre20070611.ebuild
deleted file mode 100644
index 332c4e5..0000000
--- a/dev-java/maven-script/maven-script-2.1_pre20070611.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-SRC_URI="http://dev.gentooexperimental.org/~kiorky/${P}.tar.bz2";
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="source doc"
-COMMON_DEPS="
-dev-java/ant-core
-dev-java/bsh
-=dev-java/classworlds-1.1*
-dev-java/maven-artifact
-dev-java/maven-model
-dev-java/maven-plugin-api
-dev-java/maven-plugin-descriptor
-dev-java/maven-project
-dev-java/plexus-archiver
-dev-java/plexus-classworlds
->=dev-java/plexus-utils-1.4.7_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-dev-java/plexus-component-factories
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-ant-core
-bsh
-classworlds-1.1
-maven-artifact
-maven-model
-maven-plugin-api
-maven-plugin-descriptor
-maven-project
-plexus-archiver
-plexus-classworlds
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-plexus-component-factories
-"
-JAVA_MAVEN_PROJECTS="
-maven-script-ant
-maven-script-beanshell
-"
-

diff --git a/dev-java/maven-script/metadata.xml 
b/dev-java/maven-script/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-script/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-settings/ChangeLog 
b/dev-java/maven-settings/ChangeLog
deleted file mode 100644
index b9c77fe..0000000
--- a/dev-java/maven-settings/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-# ChangeLog for dev-java/maven-settings
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-settings-2.1_pre20070611.ebuild:
-  fix DEPENDS
-
-  11 Jun 2007; kiorky <[email protected]> -maven-settings-2.0.ebuild,
-  +maven-settings-2.1_pre20070611.ebuild:
-  Maven 2.1 Bump
-
-  02 Jun 2007; kiorky <[email protected]> maven-settings-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH
-
-  29 May 2007; kiorky <[email protected]> maven-settings-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  19 May 2007; Alistair John Bush <[email protected]>
-  maven-settings-2.0.ebuild:
-  Adding to ~amd64, Restricted tests
-
-  01 May 2007; kiorky <[email protected]> +maven-settings-2.0.6.ebuild,
-  +metadata.xml:
-  Added as a maven dependency, #177499
-

diff --git a/dev-java/maven-settings/Manifest b/dev-java/maven-settings/Manifest
deleted file mode 100644
index c99cdeb..0000000
--- a/dev-java/maven-settings/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-settings-2.1_pre20070611-gen-src.tar.bz2 16589 SHA256 
df7e306cfedee5b71d31c7211c4cef61f7c8f6cd6cde4028ebc1aab63e50c3c9
-DIST maven-settings-2.1_pre20070611.tar.bz2 19556 SHA256 
ce0282adc534b2209fa6a49df114c509ac41de741ea2ac23932d0bb249d2721a

diff --git a/dev-java/maven-settings/maven-settings-2.1_pre20070611.ebuild 
b/dev-java/maven-settings/maven-settings-2.1_pre20070611.ebuild
deleted file mode 100644
index 42320dd..0000000
--- a/dev-java/maven-settings/maven-settings-2.1_pre20070611.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-
-JAVA_PKG_IUSE="source" #no javadoc target
-
-JAVA_MAVEN_ADD_GENERATED_STUFF="y"
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEPS="
-=dev-java/jdom-1.0*
-dev-java/maven-build-context
-dev-java/maven-model
->=dev-java/plexus-utils-1.4.7_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-JAVA_MAVEN_CLASSPATH="
-jdom-1.0
-maven-build-context
-maven-model
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-"
-
-RESTRICT=test
-

diff --git a/dev-java/maven-settings/metadata.xml 
b/dev-java/maven-settings/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-settings/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven-shared-components/ChangeLog 
b/dev-java/maven-shared-components/ChangeLog
deleted file mode 100644
index a2538e1..0000000
--- a/dev-java/maven-shared-components/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-# ChangeLog for dev-java/maven-shared-components
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Nov 2007; kiorky <[email protected]> ChangeLog:
-  deps cleanup
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-shared-components-2.1_pre20071021.ebuild:
-  deps cleanup
-
-  03 Nov 2007; kiorky <[email protected]>
-  maven-shared-components-2.1_pre20071021.ebuild,
-  +files/maven-artifact.patch:
-  fix to use current maven-artifact (a patch was needed)
-
-  21 Oct 2007; kiorky <[email protected]>
-  maven-shared-components-2.1_pre20071021.ebuild:
-  fix DEPENDS
-
-  18 Jun 2007; kiorky <[email protected]> ChangeLog:
-  dev-java/maven-shared-components added as a maven dependency. See #182518.
-  Cleanup of its inner components
-

diff --git a/dev-java/maven-shared-components/Manifest 
b/dev-java/maven-shared-components/Manifest
deleted file mode 100644
index ca239a4..0000000
--- a/dev-java/maven-shared-components/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST maven-shared-components-2.1_pre20071021-gen-src.tar.bz2 17914 SHA256 
65d23e64989c5ef4f6e697e8160a477bd711761d37e37cda3cb7c51e9fd62597
-DIST maven-shared-components-2.1_pre20071021.tar.bz2 4784967 SHA256 
78ed83e037f6f69017f63755bdd19a0b36fc8422c422e7a03f0c19203230b797

diff --git a/dev-java/maven-shared-components/files/maven-artifact.patch 
b/dev-java/maven-shared-components/files/maven-artifact.patch
deleted file mode 100644
index 624e3ab..0000000
--- a/dev-java/maven-shared-components/files/maven-artifact.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: 
maven-shared-components-2.1_pre20071021/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
-===================================================================
---- 
maven-shared-components-2.1_pre20071021/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
      (révision 586876)
-+++ 
maven-shared-components-2.1_pre20071021/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
      (copie de travail)
-@@ -105,10 +105,13 @@
- 
-             return listener.getRootNode();
-         }
-+        /* gentoo java patch
-+         
-         catch ( ArtifactResolutionException exception )
-         {
-             throw new DependencyTreeBuilderException( "Cannot build project 
dependency tree", exception );
-         }
-+        */
-         catch ( InvalidDependencyVersionException e )
-         {
-             throw new DependencyTreeBuilderException( "Invalid dependency 
version for artifact "
-Index: 
maven-shared-components-2.1_pre20071021/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
-===================================================================
---- 
maven-shared-components-2.1_pre20071021/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
        (révision 586876)
-+++ 
maven-shared-components-2.1_pre20071021/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
        (copie de travail)
-@@ -67,7 +67,6 @@
-                                             ArtifactRepository 
theLocalRepository, List theRemoteRepositories,
-                                             ArtifactMetadataSource theSource, 
ArtifactFilter theFilter,
-                                             List theListeners )
--        throws ArtifactResolutionException
-     {
-         Set nodes = new HashSet();
-         ArtifactResolutionResult arr = new ArtifactResolutionResult();
-@@ -96,7 +95,6 @@
-                                             ArtifactRepository 
theLocalRepository, List theRemoteRepositories,
-                                             ArtifactMetadataSource theSource, 
ArtifactFilter theFilter,
-                                             List theListeners )
--        throws ArtifactResolutionException
-     {
-         Set nodes = new HashSet();
-         ArtifactResolutionResult arr = new ArtifactResolutionResult();
-@@ -110,4 +108,23 @@
-         return arr;
-     }
- 
-+
-+
-+
-+
-+    /**
-+     * gentoo-java-patch
-+     */
-+    public ArtifactResolutionResult collect( Set artifacts, Artifact 
originatingArtifact, Map managedVersions,
-+            ArtifactRepository localRepository, List remoteRepositories,
-+            ArtifactMetadataSource source, ArtifactFilter filter, List 
listeners,
-+            List conflictResolvers ) throws ArtifactResolutionException
-+    {
-+        return this.collect(
-+            artifacts,originatingArtifact
-+            ,managedVersions,localRepository
-+            ,remoteRepositories,source,filter,listeners,null);
-+
-+    }
-+
- }
-Index: 
maven-shared-components-2.1_pre20071021/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
-===================================================================
---- 
maven-shared-components-2.1_pre20071021/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
 (révision 586876)
-+++ 
maven-shared-components-2.1_pre20071021/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactResolver.java
 (copie de travail)
-@@ -158,5 +158,17 @@
-         // TODO Auto-generated method stub
- 
-     }
--
-+    // gentoo-java patch
-+    public ArtifactResolutionResult  
resolve(org.apache.maven.artifact.resolver.ArtifactResolutionRequest a) {return 
null;}
-+    public ArtifactResolutionResult  resolveTransitively(
-+    java.util.Set a
-+    ,org.apache.maven.artifact.Artifact b
-+    ,java.util.Map c
-+    ,org.apache.maven.artifact.repository.ArtifactRepository d
-+    ,java.util.List e
-+    ,org.apache.maven.artifact.metadata.ArtifactMetadataSource f
-+    ,org.apache.maven.artifact.resolver.filter.ArtifactFilter g
-+    ,java.util.List h
-+    ,java.util.List i
-+    ){return null;}
- }

diff --git a/dev-java/maven-shared-components/files/plugin-testing-tools.patch 
b/dev-java/maven-shared-components/files/plugin-testing-tools.patch
deleted file mode 100644
index 7ed364c..0000000
--- a/dev-java/maven-shared-components/files/plugin-testing-tools.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: 
maven-plugin-testing-tools-2.1_pre20070603.new/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
-===================================================================
---- 
maven-shared-components-2.1_pre20070615/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
   (révision 546838)
-+++ 
maven-shared-components-2.1_pre20070615/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
   (copie de travail)
-@@ -97,7 +97,7 @@
-         Settings settings;
-         try
-         {
--            settings = settingsBuilder.buildSettings();
-+            settings = settingsBuilder.buildSettings(null,null);
-         }
-         catch ( IOException e )
-         {
-
-
-

diff --git 
a/dev-java/maven-shared-components/maven-shared-components-2.1_pre20071021.ebuild
 
b/dev-java/maven-shared-components/maven-shared-components-2.1_pre20071021.ebuild
deleted file mode 100644
index 2203cf5..0000000
--- 
a/dev-java/maven-shared-components/maven-shared-components-2.1_pre20071021.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-JAVA_MAVEN_ADD_GENERATED_STUFF="Y"
-
-inherit java-maven-2
-
-DESCRIPTION="Maven is a software project management and comprehension tool."
-HOMEPAGE="http://maven.apache.org/";
-MY_BASE_URL="http://dev.gentooexperimental.org/~kiorky";
-SRC_URI="${MY_BASE_URL}/${P}.tar.bz2
-${MY_BASE_URL}/${P}-gen-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="source doc"
-COMMON_DEPS="
-dev-java/maven-base-poms
-dev-java/ant-core
-dev-java/ant-junit
-dev-java/bsh
-=dev-java/doxia-1.0_alpha8*
->dev-java/doxia-1.0_alpha8
-=dev-java/easymock-1*
-dev-java/junit
->dev-java/maven-artifact-2.1_pre20070614
-dev-java/maven-core
-dev-java/maven-model
-dev-java/maven-plugin-api
-dev-java/maven-plugin-descriptor
-dev-java/maven-project
-dev-java/maven-settings
-dev-java/plexus-archiver
-dev-java/plexus-classworlds
-dev-java/plexus-compiler
-dev-java/maven-model-v3
-=dev-java/dom4j-1.4*
->=dev-java/plexus-utils-1.4.7_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
-dev-java/qdox
-dev-java/bcel
-dev-java/wagon-provider-api
-dev-java/plexus-digest
-dev-java/commons-collections
-dev-java/xalan
-dev-java/xml-commons
-dev-java/maven-reporting
-dev-java/commons-validator
-=dev-java/asm-3*
-dev-java/maven-build-context
-"
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS}"
-
-JAVA_MAVEN_CLASSPATH="
-commons-validator
-commons-collections
-ant-core
-ant-junit
-bsh
-doxia-1.0_alpha8
-doxia
-plexus-digest
-easymock-1
-junit
-dom4j-1.4
-bcel
-maven-build-context
-maven-core
-maven-model
-maven-plugin-api
-maven-plugin-descriptor
-maven-project
-maven-settings
-plexus-archiver
-plexus-classworlds
-maven-model-v3
-plexus-compiler
-plexus-utils-1.4.7
-plexus-container-default-1.0_alpha33
-plexus-component-api-1.0_alpha33
-qdox-1.6
-wagon-provider-api
-xalan
-xml-commons
-maven-reporting
-asm-3
-maven-artifact
-"
-# PLEASE KEEP  THE ORDER !
-JAVA_MAVEN_PROJECTS="
-maven-reporting-impl
-maven-shared-io
-maven-plugin-tools
-file-management
-maven-ant
-maven-common-artifact-filters
-maven-app-configuration
-maven-repository-builder
-maven-plugin-tools/maven-plugin-tools-model
-maven-plugin-tools/maven-plugin-tools-api
-maven-plugin-tools/maven-plugin-tools-java
-maven-plugin-tools/maven-plugin-tools-ant
-maven-plugin-tools/maven-plugin-tools-beanshell
-maven-plugin-testing-harness
-maven-invoker
-maven-shared-monitor
-maven-verifier
-maven-archiver
-maven-dependency-analyzer
-maven-dependency-tree
-maven-downloader
-maven-model-converter
-maven-osgi
-maven-script
-maven-shared-jar
-maven-test-tools
-maven-toolchain
-"
-
-# maven-web-ui-tests
-
-JAVA_MAVEN_GENERATED_STUFF_UNPACK_DIR="${S}"
-JAVA_MAVEN_PATCHES="${FILESDIR}/maven-artifact.patch"
-# NOTE:
-# * Be carefull, top pom.xml modules  were broken, i updated it by  hand 
before tarballing it ...
-# for maven parent pom, just kick off the parent node from the pom.xml file!
-# Maybe following modules are not neccessary so i dont include them:
-# * maven-web-ui-tests #needing selenium / not used so not packaged atm

diff --git a/dev-java/maven-shared-components/metadata.xml 
b/dev-java/maven-shared-components/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven-shared-components/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/maven/ChangeLog b/dev-java/maven/ChangeLog
deleted file mode 100644
index 441e902..0000000
--- a/dev-java/maven/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-# ChangeLog for dev-java/maven
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  28 Mar 2008; Alistair Bush <[email protected]> maven-2.1.ebuild,
-  +maven-2.1-r1.ebuild:
-  Bumping maven to remove wagon-http.
-
-  03 Nov 2007; kiorky <[email protected]> maven-2.1.ebuild:
-  fix DEPENDS
-
-  03 Nov 2007; kiorky <[email protected]> maven-2.1.ebuild:
-  First release of maven 2.1, see #175034.
-
-  11 Jun 2007; kiorky <[email protected]> -files/maven-2.0.pom,
-  +maven-2.1.ebuild, +files/maven-2.1.pom:
-  Maven 2.1 Bump
-
-  03 Jun 2007; kiorky <[email protected]> maven-2.0.ebuild:
-  adding a dep for plugins / correcting DEPENDS
-
-  02 Jun 2007; kiorky <[email protected]> maven-2.0.ebuild:
-  moving to JAVA_MAVEN_CLASSPATH / correct DEPENDS
-
-  02 Jun 2007; kiorky <[email protected]> files/mvn:
-  upgrading launch script
-
-  29 May 2007; kiorky <[email protected]> files/mvn:
-  update mvn script
-
-  29 May 2007; kiorky <[email protected]> maven-2.0.ebuild:
-  Adding maven bootstrap flag
-
-  28 May 2007; kiorky <[email protected]> maven-2.0.ebuild, +files/mvn:
-  reshape the maven launcher
-
-  27 May 2007; kiorky <[email protected]> maven-2.0.ebuild:
-  rewrite launch script
-
-  27 May 2007; kiorky <[email protected]> maven-2.0.ebuild:
-  Commiting as finnaly working
-
-  26 May 2007; kiorky <[email protected]> maven-2.0.ebuild,
-  files/mvn-non-bin:
-  install mvn script
-
-  26 May 2007; kiorky <[email protected]> maven-2.0.ebuild:
-  install mvn script
-
-  01 May 2007; kiorky <[email protected]> +maven-2.0.6.ebuild,
-  +metadata.xml:
-  Added as a maven dependency
-

diff --git a/dev-java/maven/files/m2_classworlds.conf 
b/dev-java/maven/files/m2_classworlds.conf
deleted file mode 100644
index dd3620c..0000000
--- a/dev-java/maven/files/m2_classworlds.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
-
-set maven.home default ${user.home}/m2
-
-[plexus.core]
-load /usr/share/maven-2/lib/*.jar
-

diff --git a/dev-java/maven/files/maven-2.1.pom 
b/dev-java/maven/files/maven-2.1.pom
deleted file mode 100644
index 92f8931..0000000
--- a/dev-java/maven/files/maven-2.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven</artifactId>
-  <packaging>pom</packaging>
-  <name>Maven Project</name>
-  <version>2.0.7-SNAPSHOT</version>
-  <description>Maven components parent</description>
-</project>

diff --git a/dev-java/maven/files/mvn b/dev-java/maven/files/mvn
deleted file mode 100755
index 4096514..0000000
--- a/dev-java/maven/files/mvn
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-gjl_vm=$(gjl -v -p "maven-2")
-gjl_vm=${gjl_vm//gjl_vm=/}
-gjl_vm="${gjl_vm//\"/}"
-
-if [[ -n ${gjl_vm} ]];then
-       java_cmd=$(GENTOO_VM=${gjl_vm} java-config -J)
-else
-       java_cmd=$(java-config -J)
-fi
-
-if [[ ${1} == "fromportage" ]];then
-       # use maven repo and offline mode when used in portage ebuilds
-       shift
-       "${java_cmd}" \
-       -classpath $(java-config -p classworlds-1.1) \
-       -Dclassworlds.conf=__MAVENHOME__/conf/m2_classworlds.conf \
-       -Dmaven.home=__MAVENHOME__ \
-       -Dmaven.repo.remote=__MAVENHOME__/gentoo-repo \
-       -Dmaven.repo.local=__MAVENHOME__/gentoo-repo \
-       org.codehaus.classworlds.Launcher \
-       -o  ${@} # OFFLINE MODE !
-elif [[ $(id -u) == "0" ]];then
-       # as root and not from portage, use local repo and online mode
-       if [[ ! -d "__MAVENROOT__" ]];then
-               mkdir -p "__MAVENROOT__" || die
-       fi
-       if [[ ! -d "__MAVENROOT__/gentoo-repo" ]];then
-               mkdir -p "__MAVENROOT__/gentoo-repo" || die
-       fi
-       if [[ ! -d "__MAVENROOT__/plugins" ]];then
-               mkdir -p "__MAVENROOT__/plugins" || die
-       fi
-       "${java_cmd}" \
-       -classpath $(java-config -p classworlds-1.1) \
-       -Dclassworlds.conf=__MAVENHOME__/conf/m2_classworlds.conf \
-       -Dmaven.home=__MAVENROOT__ \
-       -Dmaven.repo.remote=__MAVENROOT__/gentoo-repo \
-       -Dmaven.repo.local=__MAVENROOT__/gentoo-repo \
-       org.codehaus.classworlds.Launcher \
-       ${@}
-else
-       # do everything as user
-       "${java_cmd}" \
-       -classpath $(java-config -p classworlds-1.1) \
-       -Dclassworlds.conf=__MAVENHOME__/conf/m2_classworlds.conf \
-       -Dmaven.home=__MAVENHOME__ \
-       -Dmaven.repo.remote=${HOME}/.m2/repository \
-       -Dmaven.repo.local=${HOME}/.m2/repository  \
-       org.codehaus.classworlds.Launcher \
-       ${@}
-fi
-

diff --git a/dev-java/maven/files/settings.xml 
b/dev-java/maven/files/settings.xml
deleted file mode 100644
index daa5186..0000000
--- a/dev-java/maven/files/settings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<settings xmlns="http://maven.apache.org/POM/4.0.0";
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-        http://maven.apache.org/xsd/settings-1.0.0.xsd";>
-        <localRepository>${maven.repo.remote}</localRepository>
-        <interactiveMode>true</interactiveMode>
-        <usePluginRegistry>false</usePluginRegistry>
-        <offline>true</offline>
-        <pluginGroups>
-                <pluginGroup>org.codehaus.mojo</pluginGroup>
-        </pluginGroups>
-</settings>
-
-

diff --git a/dev-java/maven/maven-2.1-r1.ebuild 
b/dev-java/maven/maven-2.1-r1.ebuild
deleted file mode 100644
index 264a58f..0000000
--- a/dev-java/maven/maven-2.1-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2 java-pkg-2 java-utils-2
-
-DESCRIPTION="The core of Maven"
-LICENSE="Apache-2.0"
-HOMEPAGE="http://maven.apache.org";
-COMMON_DEPS="
-dev-java/maven-artifact
-dev-java/maven-base-poms
-dev-java/maven-build-context
-dev-java/maven-core
-dev-java/maven-embedder
-dev-java/maven-error-diagnostics
-dev-java/maven-lifecycle
-dev-java/maven-model
-dev-java/maven-monitor
-dev-java/maven-plugin-api
-dev-java/maven-plugin-descriptor
-dev-java/maven-plugin-parameter-documenter
-dev-java/maven-plugins
-dev-java/maven-profile
-dev-java/maven-project
-dev-java/maven-reporting
-dev-java/maven-script
-dev-java/maven-settings
-dev-java/maven-shared-components
-
-dev-java/doxia
-
-dev-java/wagon-file
-dev-java/wagon-ftp
-dev-java/wagon-http-lightweight
-dev-java/wagon-http-shared
-dev-java/wagon-provider-api
-dev-java/wagon-ssh
-dev-java/wagon-ssh-common
-dev-java/wagon-ssh-common-test
-dev-java/wagon-ssh-external
-
-=dev-java/commons-cli-1*
-=dev-java/jdom-1.0*
-dev-java/jsch
-dev-java/jtidy
-
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/plexus-active-collections
-dev-java/plexus-classworlds
-dev-java/plexus-interactivity-api
-"
-
-
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS} ${MAVEN_PLUGINS_DEPS}
-source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS} ${MAVEN_PLUGINS_DEPS}"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc source"
-SLOT="2"
-
-# maven-repository-metadata
-MAVEN_UBERJAR_FAKE="
-maven-artifact
-maven-build-context
-maven-core
-maven-embedder
-maven-error-diagnostics
-maven-lifecycle
-maven-model
-maven-monitor
-maven-plugin-api
-maven-plugin-descriptor
-maven-plugin-parameter-documenter
-maven-plugins
-maven-profile
-maven-project
-maven-reporting
-maven-script
-maven-settings
-maven-shared-components
-
-doxia
-
-wagon-file
-wagon-ftp
-wagon-http-lightweight
-wagon-http-shared
-wagon-provider-api
-wagon-ssh
-wagon-ssh-common
-wagon-ssh-common-test
-wagon-ssh-external
-
-commons-cli-1
-jdom-1.0
-jsch
-jtidy
-
-plexus-active-collections
-plexus-classworlds
-plexus-utils-1.4.7
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-interactivity-api
-"
-
-src_unpack() {
-       mkdir -p "${S}/gentoo_maven_jars" || die
-
-       cd "${S}/gentoo_maven_jars" || die
-       for i in ${MAVEN_UBERJAR_FAKE};do
-               java-pkg_jar-from ${i}
-       done
-
-       # maven settings needs to be first
-       inc=0
-       for i in $(ls -1 *maven-settings*jar );do
-               inc=$((inc+1))
-               mv "$i" "0${inc}_${i}"
-       done
-       # maven-core needs to be second
-       inc=0
-       for i in $(ls -1 *maven-core*jar );do
-               inc=$((inc+1))
-               mv "$i" "0${inc}_${i}"
-       done
-
-
-       # copy our pom
-       cp "${FILESDIR}/maven-${PV}.pom" "${S}/pom.xml" || die
-
-       # generate our launch script
-       if [[ ! -f "${S}/mvn" ]];then
-               cp "${FILESDIR}/mvn" "${S}/mvn" || die
-               sed -i "${S}/mvn" -re 
"s:__MAVENHOME__:${JAVA_MAVEN_SYSTEM_HOME}:g" || die
-               sed -i "${S}/mvn" -re 
"s:__MAVENROOT__:${JAVA_MAVEN_ROOT_HOME}:g" || die
-       else
-               die "mvn file allready exists"
-       fi
-}
-
-src_install() {
-       # register maven pom
-       java-maven-2_install_one
-
-       # replacement for maven uberjar
-       cd "${S}/gentoo_maven_jars" || die
-       for i in $(ls -1 .); do
-               java-pkg_dojar ${i}
-       done
-
-       cd "${S}" || die
-
-       # classworlds and basic maven configurations
-       keepdir "${JAVA_MAVEN_SYSTEM_HOME}/conf"
-       insinto "${JAVA_MAVEN_SYSTEM_HOME}/conf"
-       doins "${FILESDIR}/m2_classworlds.conf"
-       doins "${FILESDIR}/settings.xml"
-
-       # install our launchers
-       # classworlds and basic maven configurations
-       keepdir "${JAVA_MAVEN_ROOT_HOME}/conf"
-       insinto "${JAVA_MAVEN_ROOT_HOME}/conf"
-       doins "${FILESDIR}/m2_classworlds.conf"
-       doins "${FILESDIR}/settings.xml"
-
-       chmod 755 "${S}/mvn" || die
-       exeinto /usr/bin
-       doexe  "${S}/mvn"
-}
-
-
-# NOTES: PLEASE DO NOT ADD WAGON-HTTP. THIS WILL CONFLICT AND PREVENT MAVEN TO
-# DOWNLOAD ANYTHING
-
-

diff --git a/dev-java/maven/maven-2.1.ebuild b/dev-java/maven/maven-2.1.ebuild
deleted file mode 100644
index 104bd4e..0000000
--- a/dev-java/maven/maven-2.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_MAVEN_BOOTSTRAP="Y"
-inherit java-maven-2 java-pkg-2 java-utils-2
-
-DESCRIPTION="The core of Maven"
-LICENSE="Apache-2.0"
-HOMEPAGE="http://maven.apache.org";
-COMMON_DEPS="
-dev-java/maven-artifact
-dev-java/maven-base-poms
-dev-java/maven-build-context
-dev-java/maven-core
-dev-java/maven-embedder
-dev-java/maven-error-diagnostics
-dev-java/maven-lifecycle
-dev-java/maven-model
-dev-java/maven-monitor
-dev-java/maven-plugin-api
-dev-java/maven-plugin-descriptor
-dev-java/maven-plugin-parameter-documenter
-dev-java/maven-plugins
-dev-java/maven-profile
-dev-java/maven-project
-dev-java/maven-reporting
-dev-java/maven-script
-dev-java/maven-settings
-dev-java/maven-shared-components
-
-dev-java/doxia
-
-dev-java/wagon-file
-dev-java/wagon-ftp
-dev-java/wagon-http-lightweight
-dev-java/wagon-http-shared
-dev-java/wagon-provider-api
-dev-java/wagon-ssh
-dev-java/wagon-ssh-common
-dev-java/wagon-ssh-common-test
-dev-java/wagon-ssh-external
-
-=dev-java/commons-cli-1*
-=dev-java/jdom-1.0*
-dev-java/jsch
-dev-java/jtidy
-
->=dev-java/plexus-component-api-1.0_alpha33_pre20071021
->=dev-java/plexus-container-default-1.0_alpha33_pre20071021
->=dev-java/plexus-utils-1.4.7_pre20071021
-dev-java/plexus-active-collections
-dev-java/plexus-classworlds
-dev-java/plexus-interactivity-api
-"
-
-
-DEPEND=">=virtual/jdk-1.4 ${COMMON_DEPS} ${MAVEN_PLUGINS_DEPS}
-source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4 ${COMMON_DEPS} ${MAVEN_PLUGINS_DEPS}"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc source"
-SLOT="2"
-
-# maven-repository-metadata
-MAVEN_UBERJAR_FAKE="
-maven-artifact
-maven-build-context
-maven-core
-maven-embedder
-maven-error-diagnostics
-maven-lifecycle
-maven-model
-maven-monitor
-maven-plugin-api
-maven-plugin-descriptor
-maven-plugin-parameter-documenter
-maven-plugins
-maven-profile
-maven-project
-maven-reporting
-maven-script
-maven-settings
-maven-shared-components
-
-doxia
-
-wagon-file
-wagon-ftp
-wagon-http
-wagon-http-lightweight
-wagon-http-shared
-wagon-provider-api
-wagon-ssh
-wagon-ssh-common
-wagon-ssh-common-test
-wagon-ssh-external
-
-commons-cli-1
-jdom-1.0
-jsch
-jtidy
-
-plexus-active-collections
-plexus-classworlds
-plexus-utils-1.4.7
-plexus-component-api-1.0_alpha33
-plexus-container-default-1.0_alpha33
-plexus-interactivity-api
-"
-
-src_unpack() {
-       mkdir -p "${S}/gentoo_maven_jars" || die
-
-       cd "${S}/gentoo_maven_jars" || die
-       for i in ${MAVEN_UBERJAR_FAKE};do
-               java-pkg_jar-from ${i}
-       done
-
-       # maven settings needs to be first
-       inc=0
-       for i in $(ls -1 *maven-settings*jar );do
-               inc=$((inc+1))
-               mv "$i" "0${inc}_${i}"
-       done
-       # maven-core needs to be second
-       inc=0
-       for i in $(ls -1 *maven-core*jar );do
-               inc=$((inc+1))
-               mv "$i" "0${inc}_${i}"
-       done
-
-
-       # copy our pom
-       cp "${FILESDIR}/maven-${PV}.pom" "${S}/pom.xml" || die
-
-       # generate our launch script
-       if [[ ! -f "${S}/mvn" ]];then
-               cp "${FILESDIR}/mvn" "${S}/mvn" || die
-               sed -i "${S}/mvn" -re 
"s:__MAVENHOME__:${JAVA_MAVEN_SYSTEM_HOME}:g" || die
-               sed -i "${S}/mvn" -re 
"s:__MAVENROOT__:${JAVA_MAVEN_ROOT_HOME}:g" || die
-       else
-               die "mvn file allready exists"
-       fi
-}
-
-src_install() {
-       # register maven pom
-       java-maven-2_install_one
-
-       # replacement for maven uberjar
-       cd "${S}/gentoo_maven_jars" || die
-       for i in $(ls -1 .); do
-               java-pkg_dojar ${i}
-       done
-
-       cd "${S}" || die
-
-       # classworlds and basic maven configurations
-       keepdir "${JAVA_MAVEN_SYSTEM_HOME}/conf"
-       insinto "${JAVA_MAVEN_SYSTEM_HOME}/conf"
-       doins "${FILESDIR}/m2_classworlds.conf"
-       doins "${FILESDIR}/settings.xml"
-
-       # install our launchers
-       # classworlds and basic maven configurations
-       keepdir "${JAVA_MAVEN_ROOT_HOME}/conf"
-       insinto "${JAVA_MAVEN_ROOT_HOME}/conf"
-       doins "${FILESDIR}/m2_classworlds.conf"
-       doins "${FILESDIR}/settings.xml"
-
-       chmod 755 "${S}/mvn" || die
-       exeinto /usr/bin
-       doexe  "${S}/mvn"
-}
-
-
-# NOTES: PLEASE DO NOT ADD WAGON-HTTP. THIS WILL CONFLICT AND PREVENT MAVEN TO
-# DOWNLOAD ANYTHING
-
-

diff --git a/dev-java/maven/metadata.xml b/dev-java/maven/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/maven/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

Reply via email to