From: Patrice Clement <monsieurp@gentoo.org>
Date: Sun, 13 Sep 2015 16:11:12 +0000 (+0000)
Subject: dev-java/{mockobjects,xdoclet}: Packages removal. Fixes bug 190307.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51e1b394cdea39a3f6cd40d3ee772c204e56cab0;p=gentoo.git

dev-java/{mockobjects,xdoclet}: Packages removal. Fixes bug 190307.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---

diff --git a/dev-java/mockobjects/Manifest b/dev-java/mockobjects/Manifest
deleted file mode 100644
index 9b4ad07295db..000000000000
--- a/dev-java/mockobjects/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mockobjects-java-0.09-gentoo.tar.bz2 98965 SHA256 e869b4cb103e07d041f06f5fa5dfaa5e6eaad2d709ab2cf5446c9fff3b4f5d16 SHA512 212616dc1ebe6a1e21cea932d1eb9b7fd7d391f45f70f7d532a2a65cb71d3dcc69c6eb11d01875a6dfda4874a319cae1b45bb53e6291811a1f11c5a7dee02523 WHIRLPOOL 11d56f40b21de1609a3dd668b279a23e01e53c26b2b29bca36acf0e21b78f2a279adda20bd74fbc4381ffdd6707985974ca3a33794976ca7a9c009233fcd20c3
diff --git a/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch
deleted file mode 100644
index 22ac56cf5c08..000000000000
--- a/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- build.xml.orig	2007-01-07 15:54:42.000000000 +0100
-+++ build.xml	2007-01-07 16:40:45.000000000 +0100
-@@ -70,7 +70,8 @@
-     <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
-     <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
-     <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
--    <available property="j2ee.version" value="1.2"
-+    <!--
-+	<available property="j2ee.version" value="1.2"
-                classpathref="lib.classpath"
-                classname="javax.servlet.Servlet" />
-     <available property="j2ee.version" value="1.3"
-@@ -79,6 +80,7 @@
-     <available property="httpclient" value="true"
-                classpathref="lib.classpath"
-                classname="org.apache.commons.httpclient.HttpClient" />
-+	-->
- 
-     <property name="jar.j2ee.name" value="" />
- 
-@@ -118,7 +120,6 @@
-            srcdir="${src.core.dir}">
-       <classpath>
-         <path refid="lib.classpath" />
--        <pathelement path="${java.class.path}" />
-       </classpath>
-     </javac>
- 
-@@ -134,7 +135,6 @@
-       <src path="${src.jdk.dir}/common" />
-       <classpath>
-         <path refid="lib.classpath" />
--        <pathelement path="${java.class.path}" />
-         <pathelement path="${core.classes}" />
-       </classpath>
-     </javac>
-@@ -158,7 +158,6 @@
- 
-       <classpath>
-         <path refid="lib.classpath" />
--        <pathelement path="${java.class.path}" />
-         <pathelement path="${core.classes}" />
-         <pathelement path="${jdk.classes}" />
-       </classpath>
-@@ -179,7 +178,6 @@
-         <pathelement location="${j2ee.classes}" />
-         <pathelement location="${jdk.classes}" />
-         <pathelement location="${core.classes}" />
--        <pathelement path="${java.class.path}" />
-       </classpath>
- 
-       <formatter type="plain" usefile="false" />
-@@ -222,7 +220,6 @@
- 
-         <classpath>
-           <path refid="lib.classpath" />
--          <pathelement path="${java.class.path}" />
-           <pathelement path="${core.classes}" />
-           <pathelement path="${jdk.classes}" />
-         </classpath>
-@@ -234,7 +231,7 @@
-   </target>
- 
-   <target name="jar"
--          depends="junit, jar-core, jar-jdk, jar-j2ee"/>
-+          depends="compile-j2ee, jar-core, jar-jdk, jar-j2ee"/>
- 
-   <target name="jar-core"
-           depends="compile-core, deliverable-names"
-@@ -292,7 +289,7 @@
-   </target>
- 
-   <target name="jar-ext-httpclient"
--          depends="junit, compile-ext-httpclient"
-+          depends="compile-ext-httpclient"
- 	  description="Generate extension mockobjects jar">
-     <jar jarfile="${out.dir}/${ant.project.name}-httpclient.jar"
-       manifest="${conf.dir}/manifest">
-@@ -322,7 +319,6 @@
- 
-       <classpath>
-         <path refid="lib.classpath" />
--        <pathelement path="${java.class.path}" />
-       </classpath>
-       <sourcepath>
-         <pathelement path="${src.dir}/core"/>
-@@ -401,8 +397,8 @@
-        ========================================================================
-     -->
-   <target name="all"
--          depends="clean, junit, jar, javadoc, dist"
--          description="do it all (clean, jar, javadoc, junit, dist)">
-+          depends="clean, jar, javadoc, dist"
-+          description="do it all (clean, jar, javadoc, dist)">
-   </target>
- 
-   <target name="src" depends="clean,prepare-dist">
-@@ -423,5 +419,12 @@
-     <delete file="${dist.name}-src.tar" />
-   </target>
- 
-+   <!-- zip the sources -->
-+   <target name="sourcezip">
-+         <zip destfile="${out.dir}/${ant.project.name}-src.zip">
-+                <zipfileset dir="src" />
-+         </zip>
-+        </target>
-+
- </project>
- 
diff --git a/dev-java/mockobjects/files/mockobjects-0.09-java15.patch b/dev-java/mockobjects/files/mockobjects-0.09-java15.patch
deleted file mode 100644
index 6fc419a1b7ec..000000000000
--- a/dev-java/mockobjects/files/mockobjects-0.09-java15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jdk/common/alt/java/io/FileImpl.java	2006-01-15 13:49:06.000000000 +0100
-+++ src/jdk/common/alt/java/io/FileImpl.java	2006-01-15 13:47:59.000000000 +0100
-@@ -171,7 +171,7 @@
-     }
- 
-     public int compareTo(Object o) {
--        return file.compareTo(o);
-+        return file.compareTo((java.io.File) o);
-     }
- 
-     public java.io.File getRealFile() {
diff --git a/dev-java/mockobjects/files/mockobjects-0.09-junit.patch b/dev-java/mockobjects/files/mockobjects-0.09-junit.patch
deleted file mode 100644
index fe80135a8bee..000000000000
--- a/dev-java/mockobjects/files/mockobjects-0.09-junit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/com/mockobjects/util/AssertMo.java	2003-05-18 22:59:40.000000000 +0200
-+++ src/core/com/mockobjects/util/AssertMo.java	2007-01-07 14:46:34.000000000 +0100
-@@ -77,7 +77,7 @@
-         assertTrue("Should not have verified", threwException);
-     }
- 
--    static protected void failNotEquals(
-+    static public void failNotEquals(
-         String message,
-         Object expected,
-         Object actual) {
diff --git a/dev-java/mockobjects/metadata.xml b/dev-java/mockobjects/metadata.xml
deleted file mode 100644
index 4cc3c6920946..000000000000
--- a/dev-java/mockobjects/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-Mock Objects is a test-first development process for building
-object-oriented software and a generic unit testing framework that
-supports that process. Mock objects give you:
-
-* A methodology for developing and using mock objects. 
-
-* A core mock objects framework. This is a library of code that supports
-  the implementation of mock objects. It is based around a set of
-  expectation classes for values and collections. There are also various
-  other classes to make mock objects easier to write or to use.
-
-* A default set of mock implementations for the standard Java platform
-  APIs. We have made a start on packages such as servlets, sql, and io.
-
-* Mock implementations for more specialised libraries, particularly
-  third party products. So far, we have started on ATG Dynamo and IBM's
-  VisualAge for Java tools API.
-
-* A community for exchanging ideas on anything related to unit testing,
-  with a bias towards Mock Objects. 
-
-Our larger aim is to make www.mockobjects.com the point of reference for
-ideas and tools for unit testing particularly based on Mock Objects. Our
-first implementation is in Java, largely because that's what we've been
-working in, but also because it has a stable set of APIs that are
-suitable for writing Mock Objects. We have applied these techniques to
-other environments and intend to publish the results here. 
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/mockobjects/mockobjects-0.09-r4.ebuild b/dev-java/mockobjects/mockobjects-0.09-r4.ebuild
deleted file mode 100644
index 8296916f8fdb..000000000000
--- a/dev-java/mockobjects/mockobjects-0.09-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Test-first development process for building object-oriented software"
-HOMEPAGE="http://mockobjects.sf.net"
-SRC_URI="https://dev.gentoo.org/~karltk/java/distfiles/mockobjects-java-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-CDEPEND="=dev-java/junit-3.8*"
-# limiting to 1.4 jdk because there's some jdk-specific tests in build.xml that end with 1.4
-# also there's bug #119080
-# feel free to fix that and investigate workingness with 1.5+
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
-	test? ( dev-java/ant-junit )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/mockobjects-java-${PV}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-junit.patch"
-	epatch "${FILESDIR}/${P}-java15.patch"
-
-	java-ant_rewrite-bootclasspath 1.5
-
-	mkdir -p out/jdk/classes || die
-
-	cd lib || die
-	java-pkg_jar-from junit
-}
-
-src_compile() {
-	# ecj doesn't like subclassing PrintWriter in 1.5
-	java-pkg_force-compiler javac
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	# doesn't seem any tests get actually run, why?
-	ANT_TASKS="ant-junit" eant junit
-}
-
-src_install() {
-	java-pkg_newjar out/${PN}-alt-jdk1.4-${PV}.jar ${PN}-alt-jdk1.4.jar
-	java-pkg_newjar out/${PN}-jdk1.4-${PV}.jar ${PN}-jdk1.4.jar
-	java-pkg_newjar out/${PN}-core-${PV}.jar ${PN}-core.jar
-	dodoc doc/README || die
-
-	use doc && java-pkg_dojavadoc out/doc/javadoc
-	use examples && java-pkg_doexamples src/examples
-	use source && java-pkg_dosrc src/core/com src/extensions/com \
-		src/jdk/common/com src/jdk/1.4/com
-}
diff --git a/dev-java/xdoclet/Manifest b/dev-java/xdoclet/Manifest
deleted file mode 100644
index 50f7649bb4fa..000000000000
--- a/dev-java/xdoclet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xdoclet-src-1.2.3.tgz 5880180 SHA256 b7b8e00954497928626db15e9759280a0dc18397dc54b02924a162e819eff4ef SHA512 ecad04c0bed00215c55f84782a74148644425efe6db4bde2717dc04854769c7617b9e396be67f9b4b6357f2f023e1658eb418f2e671305c36374d4f8849eb90f WHIRLPOOL 29f8379876ae5834a1371be582869205803248df4fa76835467ac0e14e2399f17a8e3e8d870a583940050456aba7647acb2e5ddaf252cf0cd7e57ddb211c7e03
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.2-buildfile.patch b/dev-java/xdoclet/files/xdoclet-1.2.2-buildfile.patch
deleted file mode 100644
index 968485e71959..000000000000
--- a/dev-java/xdoclet/files/xdoclet-1.2.2-buildfile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urpN xdoclet-1.2.2.orig/build.xml xdoclet-1.2.2/build.xml
---- xdoclet-1.2.2.orig/build.xml	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/build.xml	2005-04-03 05:13:12.000000000 +0200
-@@ -75,7 +75,7 @@
-         <ant dir="${samples.dir}"/>
-     </target>
- 
--    <target name="l10n" depends="core, modules">
-+    <target name="l10n">
-         <!-- messages for each locale get built into a separate jar -->
-         <jar jarfile="${dist.lib.dir}/${name}-pt_BR-locale-${version}.jar">
-             <fileset dir="${l10n.build.dir}">
-diff -urpN xdoclet-1.2.2.orig/core/build.xml xdoclet-1.2.2/core/build.xml
---- xdoclet-1.2.2.orig/core/build.xml	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/core/build.xml	2005-04-03 05:13:12.000000000 +0200
-@@ -106,7 +106,7 @@
-     <!-- =================================================================== -->
-     <!-- Compiles the source code                                            -->
-     <!-- =================================================================== -->
--    <target name="compile" depends="beautify">
-+    <target name="compile" depends="prepare">
-         <mkdir dir="${modules.all-src.dir}"/>
-         <copy todir="${modules.all-src.dir}">
-             <fileset dir="${core.src.dir}">
-diff -urpN xdoclet-1.2.2.orig/maven/build.xml xdoclet-1.2.2/maven/build.xml
---- xdoclet-1.2.2.orig/maven/build.xml	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/maven/build.xml	2005-04-03 05:13:14.000000000 +0200
-@@ -77,7 +77,7 @@
-         </jar>
-         
-         <!-- Install the plugin if MAVEN_HOME/MAVEN_LOCAL_HOME is defined -->
--        <antcall target="install"/>
-+        <!--antcall target="install"/-->
-     </target>
-     
-     <target name="clean">
-diff -urpN xdoclet-1.2.2.orig/modules/modules-common.ent xdoclet-1.2.2/modules/modules-common.ent
---- xdoclet-1.2.2.orig/modules/modules-common.ent	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/modules/modules-common.ent	2005-04-03 05:13:12.000000000 +0200
-@@ -190,7 +190,7 @@
-     <!-- =================================================================== -->
-     <!-- Compiles the source code                                            -->
-     <!-- =================================================================== -->
--    <target name="compile" depends="beautify" unless="module.jar.uptodate">
-+    <target name="compile" depends="init" unless="module.jar.uptodate">
-         <mkdir dir="${module.classes.dir}"/>
-         <javac
-             destdir="${module.classes.dir}"
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.2-interface.patch b/dev-java/xdoclet/files/xdoclet-1.2.2-interface.patch
deleted file mode 100644
index d7f9c2897873..000000000000
--- a/dev-java/xdoclet/files/xdoclet-1.2.2-interface.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java
---- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2004-10-14 04:39:06.000000000 +0200
-+++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2005-04-03 15:20:31.000000000 +0200
-@@ -4,10 +4,7 @@
-  */
- package xdoclet.modules.hibernate;
- 
--import java.util.Collection;
--import java.util.Iterator;
--import java.util.LinkedList;
--import java.util.Properties;
-+import java.util.*;
- 
- import org.apache.commons.logging.Log;
- import org.apache.tools.ant.types.Parameter;
-@@ -48,6 +45,18 @@ public class HibernateTagsHandler
- 
-     private Parameter currentOtherMapping;
- 
-+    private static boolean isHibernated(XClass xClass)
-+    {
-+        if (xClass == null) {
-+            return false;
-+        }
-+
-+        return (
-+            xClass.getDoc().getTag("hibernate.class") != null ||
-+            xClass.getDoc().getTag("hibernate.subclass") != null
-+            );
-+    }
-+
-     /**
-      * Returns full path of hibernate file for the current class.
-      *
-@@ -594,9 +603,11 @@ public class HibernateTagsHandler
-                 log.debug("typeName=" + typeName);
- 
-             Collection classes = getXJavaDoc().getSourceClasses();
-+            List reorderedClasses = flattenHierachy(getCurrentClass(), classes);
-+
-             XClass clazz;
- 
--            for (Iterator i = classes.iterator(); i.hasNext(); ) {
-+            for (Iterator i = reorderedClasses.iterator(); i.hasNext(); ) {
-                 clazz = (XClass) i.next();
- 
-                 log.debug("clazz=" + clazz);
-@@ -604,8 +615,13 @@ public class HibernateTagsHandler
-                 if (DocletSupport.isDocletGenerated(clazz)) {
-                     log.debug("isDocletGenerated");
-                 }
--                else if (clazz.getSuperclass() != null && clazz.getSuperclass().getQualifiedName().equals(typeName)) {
--                    log.debug("is a subclass");
-+                else if (isValidSubclass(clazz, getCurrentClass())) {
-+                    if (getCurrentClass().isInterface()) {
-+                        log.debug("is an implementing class");
-+                    }
-+                    else {
-+                        log.debug("is a subclass");
-+                    }
- 
-                     XClass current = getCurrentClass();
- 
-@@ -735,10 +751,108 @@ public class HibernateTagsHandler
-         //TODO: Why do we need this!!??
-     }
- 
-+    private boolean isValidSubclass(XClass clazz, XClass currentClass)
-+    {
-+        String typeName = currentClass.getQualifiedName();
-+
-+        // easy case, clazz is implementing interface of hibernated class
-+        // NB: not easy anymore, if we've got a hibernated interface hierachy
-+        // only return true for "deepest" implemented interface in this hierachy
-+        if (currentClass.isInterface() && clazz.isImplementingInterface(typeName)) {
-+            List extending = currentClass.getExtendingInterfaces();
-+
-+            if (extending.isEmpty()) {
-+                return true;
-+            }
-+
-+            for (int i = 0; i < extending.size(); i++) {
-+                XClass xClass = (XClass) extending.get(i);
-+
-+                if (isHibernated(xClass) && clazz.isImplementingInterface(xClass.getQualifiedName())) {
-+                    // we found an interface deeper in the hierachy
-+                    return false;
-+                }
-+            }
-+            return true;
-+        }
-+
-+        if (clazz.getSuperclass() != null) {
-+            // easy case, this class is direct subclass of the hibernated type
-+            if (clazz.getSuperclass().equals(typeName)) {
-+                return true;
-+            }
-+            else {
-+                // go up class hierarchy to find first hibernate tag
-+                XClass xc = clazz;
-+
-+                do {
-+                    xc = xc.getSuperclass();
-+
-+                } while (xc != null && !isHibernated(xc));
-+
-+                // did we find a valid superclass, is it the current ?
-+                if (xc != null) {
-+                    return xc.equals(currentClass);
-+                }
-+            }
-+        }
-+
-+        return false;
-+    }
-+
-     private HibernateSubTask getHibernateSubTask()
-     {
-         return ((HibernateSubTask) (DocletContext.getInstance()
-             .getSubTaskBy(DocletTask.getSubTaskName(HibernateSubTask.class))));
-     }
-+
-+    /**
-+     * Flattens the collection of classes by eliminating descendants (for hibernated non 
-+     * interface classes).
-+     *
-+     * @param currentClass
-+     * @param classes
-+     * @return
-+     */
-+    private List flattenHierachy(XClass currentClass, Collection classes)
-+    {
-+        Log log = LogUtil.getLog(HibernateTagsHandler.class, "flattenHierachy");
-+
-+        log.debug("for class " + currentClass);
-+
-+        if (!currentClass.isInterface()) {
-+            List l = new ArrayList(classes);
-+
-+            l.retainAll(currentClass.getAllSubclasses());
-+            return l;
-+        }
-+
-+        Set s = new HashSet(classes);
-+
-+        log.debug("initial set size: " + s.size());
-+
-+        for (Iterator iterator = classes.iterator(); iterator.hasNext(); ) {
-+            XClass xClass = (XClass) iterator.next();
-+
-+            if (xClass.isInterface() || !isHibernated(xClass)) {
-+                continue;
-+            }
-+
-+            List subClasses = xClass.getAllSubclasses();
-+
-+            for (int i = 0; i < subClasses.size(); i++) {
-+                XClass aClass = (XClass) subClasses.get(i);
-+
-+                if (s.contains(aClass)) {
-+                    log.debug("removing " + aClass + " from set");
-+                    s.remove(aClass);
-+                }
-+            }
-+        }
-+
-+        log.debug("new set size: " + s.size());
-+
-+        return new ArrayList(s);
-+    }
- }
- 
-diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt
---- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2004-10-10 11:43:05.000000000 +0200
-+++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2005-04-03 15:20:31.000000000 +0200
-@@ -1,4 +1,4 @@
--    <XDtMethod:ifHasMethodTag tagName="hibernate.property">
-+    <XDtMethod:ifHasMethodTag tagName="hibernate.property" superclasses="false">
-         <property
-             name="<XDtMethod:propertyName />"
-             type="<XDtMethod:methodTagValue tagName="hibernate.property" paramName="type" default="<XDtMethod:methodType/>"/>"
-@@ -20,7 +20,7 @@
-             </XDtHibernate:setCurrentTag>
-         </XDtMethod:ifHasMethodTag>
- 
--    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
-+    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" superclasses="false">
-         <many-to-one
-             name="<XDtMethod:propertyName/>"
-             class="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="class" default="<XDtMethod:methodType/>" />"
-@@ -43,7 +43,7 @@
-           </XDtHibernate:setCurrentTag>
-     </XDtMethod:ifHasMethodTag>
- 
--     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one">
-+     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one" superclasses="false">
-         <one-to-one
-             name="<XDtMethod:propertyName/>"
-             class="<XDtMethod:methodTagValue tagName="hibernate.one-to-one" paramName="class" default="<XDtMethod:methodType/>"/>"
-@@ -59,7 +59,7 @@
-         />
-      </XDtMethod:ifHasMethodTag>
- 
--     <XDtMethod:ifHasMethodTag tagName="hibernate.component">
-+     <XDtMethod:ifHasMethodTag tagName="hibernate.component" superclasses="false">
-         <component
-             name="<XDtMethod:propertyName />"
-             class="<XDtMethod:methodTagValue tagName="hibernate.component" paramName="class" default="<XDtMethod:methodType/>"/>"
-@@ -84,7 +84,7 @@
-         />
-      </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.set">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.set" superclasses="false">
-         <set
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
-@@ -114,7 +114,7 @@
-         </set>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.bag">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.bag" superclasses="false">
-         <bag
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
-@@ -143,7 +143,7 @@
-         </bag>
-         </XDtMethod:ifHasMethodTag>
- 
--    <XDtMethod:ifHasMethodTag tagName="hibernate.list">
-+    <XDtMethod:ifHasMethodTag tagName="hibernate.list" superclasses="false">
-         <list
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
-@@ -166,7 +166,7 @@
-         </list>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.map">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.map" superclasses="false">
-         <map
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
-@@ -193,7 +193,7 @@
-         </map>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.array">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.array" superclasses="false">
-         <array
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
-@@ -218,7 +218,7 @@
-         </array>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" superclasses="false">
-         <primitive-array
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" paramName="table">
-@@ -236,7 +236,7 @@
-         </primitive-array>
-         </XDtMethod:ifHasMethodTag>
- 
--          <XDtMethod:ifHasMethodTag tagName="hibernate.any">
-+          <XDtMethod:ifHasMethodTag tagName="hibernate.any" superclasses="false">
-               <any
-                   name="<XDtMethod:propertyName />"
-                   id-type="<XDtMethod:methodTagValue tagName="hibernate.any" paramName="id-type"/>"
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.3-buildfile.patch b/dev-java/xdoclet/files/xdoclet-1.2.3-buildfile.patch
deleted file mode 100644
index 968485e71959..000000000000
--- a/dev-java/xdoclet/files/xdoclet-1.2.3-buildfile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urpN xdoclet-1.2.2.orig/build.xml xdoclet-1.2.2/build.xml
---- xdoclet-1.2.2.orig/build.xml	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/build.xml	2005-04-03 05:13:12.000000000 +0200
-@@ -75,7 +75,7 @@
-         <ant dir="${samples.dir}"/>
-     </target>
- 
--    <target name="l10n" depends="core, modules">
-+    <target name="l10n">
-         <!-- messages for each locale get built into a separate jar -->
-         <jar jarfile="${dist.lib.dir}/${name}-pt_BR-locale-${version}.jar">
-             <fileset dir="${l10n.build.dir}">
-diff -urpN xdoclet-1.2.2.orig/core/build.xml xdoclet-1.2.2/core/build.xml
---- xdoclet-1.2.2.orig/core/build.xml	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/core/build.xml	2005-04-03 05:13:12.000000000 +0200
-@@ -106,7 +106,7 @@
-     <!-- =================================================================== -->
-     <!-- Compiles the source code                                            -->
-     <!-- =================================================================== -->
--    <target name="compile" depends="beautify">
-+    <target name="compile" depends="prepare">
-         <mkdir dir="${modules.all-src.dir}"/>
-         <copy todir="${modules.all-src.dir}">
-             <fileset dir="${core.src.dir}">
-diff -urpN xdoclet-1.2.2.orig/maven/build.xml xdoclet-1.2.2/maven/build.xml
---- xdoclet-1.2.2.orig/maven/build.xml	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/maven/build.xml	2005-04-03 05:13:14.000000000 +0200
-@@ -77,7 +77,7 @@
-         </jar>
-         
-         <!-- Install the plugin if MAVEN_HOME/MAVEN_LOCAL_HOME is defined -->
--        <antcall target="install"/>
-+        <!--antcall target="install"/-->
-     </target>
-     
-     <target name="clean">
-diff -urpN xdoclet-1.2.2.orig/modules/modules-common.ent xdoclet-1.2.2/modules/modules-common.ent
---- xdoclet-1.2.2.orig/modules/modules-common.ent	2005-04-03 05:13:08.000000000 +0200
-+++ xdoclet-1.2.2/modules/modules-common.ent	2005-04-03 05:13:12.000000000 +0200
-@@ -190,7 +190,7 @@
-     <!-- =================================================================== -->
-     <!-- Compiles the source code                                            -->
-     <!-- =================================================================== -->
--    <target name="compile" depends="beautify" unless="module.jar.uptodate">
-+    <target name="compile" depends="init" unless="module.jar.uptodate">
-         <mkdir dir="${module.classes.dir}"/>
-         <javac
-             destdir="${module.classes.dir}"
diff --git a/dev-java/xdoclet/files/xdoclet-1.2.3-interface.patch b/dev-java/xdoclet/files/xdoclet-1.2.3-interface.patch
deleted file mode 100644
index d7f9c2897873..000000000000
--- a/dev-java/xdoclet/files/xdoclet-1.2.3-interface.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java
---- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2004-10-14 04:39:06.000000000 +0200
-+++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/HibernateTagsHandler.java	2005-04-03 15:20:31.000000000 +0200
-@@ -4,10 +4,7 @@
-  */
- package xdoclet.modules.hibernate;
- 
--import java.util.Collection;
--import java.util.Iterator;
--import java.util.LinkedList;
--import java.util.Properties;
-+import java.util.*;
- 
- import org.apache.commons.logging.Log;
- import org.apache.tools.ant.types.Parameter;
-@@ -48,6 +45,18 @@ public class HibernateTagsHandler
- 
-     private Parameter currentOtherMapping;
- 
-+    private static boolean isHibernated(XClass xClass)
-+    {
-+        if (xClass == null) {
-+            return false;
-+        }
-+
-+        return (
-+            xClass.getDoc().getTag("hibernate.class") != null ||
-+            xClass.getDoc().getTag("hibernate.subclass") != null
-+            );
-+    }
-+
-     /**
-      * Returns full path of hibernate file for the current class.
-      *
-@@ -594,9 +603,11 @@ public class HibernateTagsHandler
-                 log.debug("typeName=" + typeName);
- 
-             Collection classes = getXJavaDoc().getSourceClasses();
-+            List reorderedClasses = flattenHierachy(getCurrentClass(), classes);
-+
-             XClass clazz;
- 
--            for (Iterator i = classes.iterator(); i.hasNext(); ) {
-+            for (Iterator i = reorderedClasses.iterator(); i.hasNext(); ) {
-                 clazz = (XClass) i.next();
- 
-                 log.debug("clazz=" + clazz);
-@@ -604,8 +615,13 @@ public class HibernateTagsHandler
-                 if (DocletSupport.isDocletGenerated(clazz)) {
-                     log.debug("isDocletGenerated");
-                 }
--                else if (clazz.getSuperclass() != null && clazz.getSuperclass().getQualifiedName().equals(typeName)) {
--                    log.debug("is a subclass");
-+                else if (isValidSubclass(clazz, getCurrentClass())) {
-+                    if (getCurrentClass().isInterface()) {
-+                        log.debug("is an implementing class");
-+                    }
-+                    else {
-+                        log.debug("is a subclass");
-+                    }
- 
-                     XClass current = getCurrentClass();
- 
-@@ -735,10 +751,108 @@ public class HibernateTagsHandler
-         //TODO: Why do we need this!!??
-     }
- 
-+    private boolean isValidSubclass(XClass clazz, XClass currentClass)
-+    {
-+        String typeName = currentClass.getQualifiedName();
-+
-+        // easy case, clazz is implementing interface of hibernated class
-+        // NB: not easy anymore, if we've got a hibernated interface hierachy
-+        // only return true for "deepest" implemented interface in this hierachy
-+        if (currentClass.isInterface() && clazz.isImplementingInterface(typeName)) {
-+            List extending = currentClass.getExtendingInterfaces();
-+
-+            if (extending.isEmpty()) {
-+                return true;
-+            }
-+
-+            for (int i = 0; i < extending.size(); i++) {
-+                XClass xClass = (XClass) extending.get(i);
-+
-+                if (isHibernated(xClass) && clazz.isImplementingInterface(xClass.getQualifiedName())) {
-+                    // we found an interface deeper in the hierachy
-+                    return false;
-+                }
-+            }
-+            return true;
-+        }
-+
-+        if (clazz.getSuperclass() != null) {
-+            // easy case, this class is direct subclass of the hibernated type
-+            if (clazz.getSuperclass().equals(typeName)) {
-+                return true;
-+            }
-+            else {
-+                // go up class hierarchy to find first hibernate tag
-+                XClass xc = clazz;
-+
-+                do {
-+                    xc = xc.getSuperclass();
-+
-+                } while (xc != null && !isHibernated(xc));
-+
-+                // did we find a valid superclass, is it the current ?
-+                if (xc != null) {
-+                    return xc.equals(currentClass);
-+                }
-+            }
-+        }
-+
-+        return false;
-+    }
-+
-     private HibernateSubTask getHibernateSubTask()
-     {
-         return ((HibernateSubTask) (DocletContext.getInstance()
-             .getSubTaskBy(DocletTask.getSubTaskName(HibernateSubTask.class))));
-     }
-+
-+    /**
-+     * Flattens the collection of classes by eliminating descendants (for hibernated non 
-+     * interface classes).
-+     *
-+     * @param currentClass
-+     * @param classes
-+     * @return
-+     */
-+    private List flattenHierachy(XClass currentClass, Collection classes)
-+    {
-+        Log log = LogUtil.getLog(HibernateTagsHandler.class, "flattenHierachy");
-+
-+        log.debug("for class " + currentClass);
-+
-+        if (!currentClass.isInterface()) {
-+            List l = new ArrayList(classes);
-+
-+            l.retainAll(currentClass.getAllSubclasses());
-+            return l;
-+        }
-+
-+        Set s = new HashSet(classes);
-+
-+        log.debug("initial set size: " + s.size());
-+
-+        for (Iterator iterator = classes.iterator(); iterator.hasNext(); ) {
-+            XClass xClass = (XClass) iterator.next();
-+
-+            if (xClass.isInterface() || !isHibernated(xClass)) {
-+                continue;
-+            }
-+
-+            List subClasses = xClass.getAllSubclasses();
-+
-+            for (int i = 0; i < subClasses.size(); i++) {
-+                XClass aClass = (XClass) subClasses.get(i);
-+
-+                if (s.contains(aClass)) {
-+                    log.debug("removing " + aClass + " from set");
-+                    s.remove(aClass);
-+                }
-+            }
-+        }
-+
-+        log.debug("new set size: " + s.size());
-+
-+        return new ArrayList(s);
-+    }
- }
- 
-diff -uprN xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt
---- xdoclet-1.2.2.orig/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2004-10-10 11:43:05.000000000 +0200
-+++ xdoclet-1.2.2/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-properties.xdt	2005-04-03 15:20:31.000000000 +0200
-@@ -1,4 +1,4 @@
--    <XDtMethod:ifHasMethodTag tagName="hibernate.property">
-+    <XDtMethod:ifHasMethodTag tagName="hibernate.property" superclasses="false">
-         <property
-             name="<XDtMethod:propertyName />"
-             type="<XDtMethod:methodTagValue tagName="hibernate.property" paramName="type" default="<XDtMethod:methodType/>"/>"
-@@ -20,7 +20,7 @@
-             </XDtHibernate:setCurrentTag>
-         </XDtMethod:ifHasMethodTag>
- 
--    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one">
-+    <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" superclasses="false">
-         <many-to-one
-             name="<XDtMethod:propertyName/>"
-             class="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="class" default="<XDtMethod:methodType/>" />"
-@@ -43,7 +43,7 @@
-           </XDtHibernate:setCurrentTag>
-     </XDtMethod:ifHasMethodTag>
- 
--     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one">
-+     <XDtMethod:ifHasMethodTag tagName="hibernate.one-to-one" superclasses="false">
-         <one-to-one
-             name="<XDtMethod:propertyName/>"
-             class="<XDtMethod:methodTagValue tagName="hibernate.one-to-one" paramName="class" default="<XDtMethod:methodType/>"/>"
-@@ -59,7 +59,7 @@
-         />
-      </XDtMethod:ifHasMethodTag>
- 
--     <XDtMethod:ifHasMethodTag tagName="hibernate.component">
-+     <XDtMethod:ifHasMethodTag tagName="hibernate.component" superclasses="false">
-         <component
-             name="<XDtMethod:propertyName />"
-             class="<XDtMethod:methodTagValue tagName="hibernate.component" paramName="class" default="<XDtMethod:methodType/>"/>"
-@@ -84,7 +84,7 @@
-         />
-      </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.set">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.set" superclasses="false">
-         <set
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.set" paramName="table">
-@@ -114,7 +114,7 @@
-         </set>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.bag">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.bag" superclasses="false">
-         <bag
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.bag" paramName="table">
-@@ -143,7 +143,7 @@
-         </bag>
-         </XDtMethod:ifHasMethodTag>
- 
--    <XDtMethod:ifHasMethodTag tagName="hibernate.list">
-+    <XDtMethod:ifHasMethodTag tagName="hibernate.list" superclasses="false">
-         <list
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.list" paramName="table">
-@@ -166,7 +166,7 @@
-         </list>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.map">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.map" superclasses="false">
-         <map
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.map" paramName="table">
-@@ -193,7 +193,7 @@
-         </map>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.array">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.array" superclasses="false">
-         <array
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.array" paramName="table">
-@@ -218,7 +218,7 @@
-         </array>
-         </XDtMethod:ifHasMethodTag>
- 
--        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array">
-+        <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" superclasses="false">
-         <primitive-array
-             <XDtHibernate:roleAttribute/>="<XDtMethod:propertyName/>"
-           <XDtMethod:ifHasMethodTag tagName="hibernate.primitive-array" paramName="table">
-@@ -236,7 +236,7 @@
-         </primitive-array>
-         </XDtMethod:ifHasMethodTag>
- 
--          <XDtMethod:ifHasMethodTag tagName="hibernate.any">
-+          <XDtMethod:ifHasMethodTag tagName="hibernate.any" superclasses="false">
-               <any
-                   name="<XDtMethod:propertyName />"
-                   id-type="<XDtMethod:methodTagValue tagName="hibernate.any" paramName="id-type"/>"
diff --git a/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch b/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch
deleted file mode 100644
index 8db9e5f84ec3..000000000000
--- a/dev-java/xdoclet/files/xdoclet-modules_common_ent.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- modules/modules-common.ent.orig	2005-02-23 15:47:39.000000000 -0500
-+++ modules/modules-common.ent	2005-02-23 17:25:17.000000000 -0500
-@@ -294,5 +294,6 @@
-             out="${module.tag.doclipse.file}"
-             extension=".xml"
-             style="${docs.stylesheets.dir}/doclipse.xslt">
-+            <xmlcatalog refid="xtags"/>
-         </xslt>
-     </target>
diff --git a/dev-java/xdoclet/metadata.xml b/dev-java/xdoclet/metadata.xml
deleted file mode 100644
index d7880ffb1370..000000000000
--- a/dev-java/xdoclet/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-	<herd>proxy-maintainers</herd>
-	<longdescription>
-  XDoclet is an extended Javadoc Doclet engine. It's a generic Java
-  tool that lets you create custom Javadoc @tags and based on those
-  @tags generate source code or other files (such as XML-ish
-  deployment descriptors) using a template engine it provides.  
-
-  It enables Attribute Oriented Programming for Java.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xdoclet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/xdoclet/xdoclet-1.2.3.ebuild b/dev-java/xdoclet/xdoclet-1.2.3.ebuild
deleted file mode 100644
index 414660e1f28f..000000000000
--- a/dev-java/xdoclet/xdoclet-1.2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source"
-WANT_ANT_TASKS="ant-nodeps ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="XDoclet is an extended Javadoc Doclet engine"
-HOMEPAGE="http://xdoclet.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-CDEPEND=">=dev-java/bsf-2.3
-	dev-java/commons-collections
-	dev-java/commons-logging
-	dev-java/log4j
-	dev-java/mockobjects
-	dev-java/velocity
-	dev-java/xjavadoc
-	=dev-java/junit-3.8*"
-DEPEND=">=virtual/jdk-1.4
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/ant-core
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-interface.patch
-	epatch "${FILESDIR}"/${P}-buildfile.patch
-
-	cd "${S}"/lib && rm -f *.jar
-	java-pkg_jar-from xjavadoc
-	java-pkg_jar-from bsf-2.3
-	java-pkg_jar-from velocity
-	java-pkg_jar-from log4j
-	java-pkg_jar-from mockobjects
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from commons-collections
-	java-pkg_jar-from velocity
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from junit
-}
-
-# TODO investigate why compiling needs junit, ie is build not sane enough to
-# devide building of test classes separate from rest of classes?
-src_compile() {
-	# bug #167445
-	use amd64 && export ANT_OPTS="-Xmx512m"
-	eant core modules maven
-}
-
-src_install() {
-	for jar in target/lib/*.jar; do
-		java-pkg_newjar ${jar} $(basename ${jar/-${PV}/})
-	done
-
-	dodoc README.txt
-	use source && java-pkg_dosrc core/src/xdoclet modules/*
-}