From: Patrice Clement <monsieurp@gentoo.org>
Date: Mon, 24 Aug 2015 15:19:44 +0000 (+0200)
Subject: dev-java/{jldap,openspml,openspml2,soap}: removal. Fixes bug 556250.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f9546ecb7ff034c6ccfdc15f663bc26e9fcba20b;p=gentoo.git

dev-java/{jldap,openspml,openspml2,soap}: removal. Fixes bug 556250.

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

diff --git a/dev-java/jldap/Manifest b/dev-java/jldap/Manifest
deleted file mode 100644
index 8c798001c035..000000000000
--- a/dev-java/jldap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jldap-4.6.tar.gz 527547 SHA256 58772b10c86f7a76a9889f3077cfdacaf1427451bcd5669deeaf986aa0c0dd2f SHA512 e949b8ee8d262a88db913a3359ad536d958c69c12c1baeaf32f7f0006d1354c7c5128e20bd557a281da3a99b20522692f7417c6d4c76fc8b5743d91f8b342ddb WHIRLPOOL 498994cc1f63be57816e73b40b797936572ffad0e60f53784d8833b30e66e50f40f819a81ae90299973653a376421e5d6a4413f72cba2ac2b9d092e8fc86de7d
diff --git a/dev-java/jldap/files/jldap-4.6-Debug.java.patch b/dev-java/jldap/files/jldap-4.6-Debug.java.patch
deleted file mode 100644
index 9da540fd5536..000000000000
--- a/dev-java/jldap/files/jldap-4.6-Debug.java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- com/novell/ldap/client/Debug.java.orig	2015-07-05 13:50:26.469000000 +0000
-+++ com/novell/ldap/client/Debug.java	2015-07-05 13:53:12.456000000 +0000
-@@ -80,7 +80,7 @@
-      * The value for this variable is set during compile time
-      *  TRUE = Debug build, FALSE = Release build
-      */
--    public static final boolean LDAP_DEBUG = true;
-+    public static final boolean LDAP_DEBUG = false;
- 
-     /**
-      * The string value used to enable all debug tracing.
diff --git a/dev-java/jldap/files/jldap-4.6-build.xml.patch b/dev-java/jldap/files/jldap-4.6-build.xml.patch
deleted file mode 100644
index f5bcefa507ff..000000000000
--- a/dev-java/jldap/files/jldap-4.6-build.xml.patch
+++ /dev/null
@@ -1,257 +0,0 @@
---- build.xml.orig	2015-07-05 18:20:19.947000000 +0000
-+++ build.xml	2015-07-05 18:20:34.996000000 +0000
-@@ -42,12 +42,20 @@
- <property name="src" value="."/>
- <property name="ext" value="ext"/>
- <property name="ldap" value="ldap"/>
-+<property name="jldap" value ="jldap"/>
-+
-+
- 
- <property name="lib" value="lib"/>
- <property name="lib.debug" value="lib_debug"/>
- 
- <property name="build" value="classes"/>
- <property name="build.debug" value="classes_debug"/>
-+<property name="build.testDir" value="tests/junit/"/>
-+<property name="build.testOutputDir" value="${build.testDir}/test-classes"/>
-+<property name="build.testResourceDir" value="src/test/resources"/>
-+
-+<property name="test.reports" value="${build}/test-reports"/>
- 
- <property name="doc" value="doc"/>
- <property name="ietfdoc" value="ietfdoc"/>
-@@ -60,6 +68,9 @@
- <property name="pkg.ietfdoc" value="${pkg}/${ietfdoc}"/>
- <property name="pkg.wars" value="${pkg}/wars"/>
- 
-+<path id="build.test.classpath">
-+</path>
-+
-     <!-- =================================================================== -->
-     <!-- Initialization                                                      -->
-     <!-- =================================================================== -->
-@@ -166,12 +177,12 @@
-     <!-- =================================================================== -->
-     <!-- build Servlets                                                       -->
-     <!-- =================================================================== -->
--    <target name="servlet_stream" depends="debug, release">
-+    <target name="servlet_stream" depends="debug">
-         <ant dir="${basedir}/com/novell/services/dsml/stream" target="all">
-             <property name="top" location="."/>
-         </ant>
-     </target>
--    <target name="servlet_dom" depends="debug, release">
-+    <target name="servlet_dom" depends="debug">
-         <ant dir="${basedir}/com/novell/services/dsml/dom" target="all">
-             <property name="top" location="."/>
-         </ant>
-@@ -201,42 +212,152 @@
-     
-     <target name="clone_wars" depends="wars"/>
- 
-+    <!-- Imported from javac.xml -->
-+    <!-- START -->
-+
-     <!-- =================================================================== -->
-     <!-- build debug classes                                                 -->
-     <!-- =================================================================== -->
--    <target name="debug" depends="init">
--        <ant antfile="javac.xml" target="debug">
--            <property name="DEBUG_VALUE" value="true"/>
--        </ant>
-+    <target name="debug" >
-+
-+        <echo message="DEBUG compile in com/novell"/>
-+        <mkdir dir="${build.debug}"/>
-+        <javac
-+                srcdir="${src}"
-+                includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
-+                excludes="com/novell/services/**/*.java,${exclude.dsmlconnection},${exclude.spmlconnection}"
-+                destdir="${build.debug}"
-+                target="1.2"
-+                deprecation="off"
-+                debug="on"
-+                optimize="off">
-+                <classpath>
-+                	<pathelement location="external/ssl/domestic/nssl1.2_dom.jar"/>
-+					<pathelement location="external/jsse/lib/jcert.jar"/>
-+					<pathelement location="external/jsse/lib/jnet.jar"/>
-+					<pathelement location="external/jsse/lib/jsse.jar"/>
-+					
-+					<!-- Take care of optional components -->
-+					<fileset dir="${ext}">
-+						<include name="commons-httpclient-*.jar"/>	
-+						<include name="openspml*.jar"/>	
-+					</fileset>
-+                </classpath>
-+        </javac>
-+
-+        <echo message="Creating DEBUG ${lib.debug}/${ldap}.jar file"/>
-+        <mkdir dir="${lib.debug}"/>
-+        <jar
-+            jarfile="${lib.debug}/${ldap}.jar"
-+            basedir="${build.debug}"
-+        />
-     </target>
- 
-     <!-- =================================================================== -->
-     <!-- build release classes                                               -->
-     <!-- =================================================================== -->
--    <target name="release" depends="init">
--        <ant antfile="javac.xml" target="release">
--            <property name="DEBUG_VALUE" value="false"/>
--        </ant>
-+    <target name="release">
-+
-+        <echo message="RELEASE compile in com/novell"/>
-+        <mkdir dir="${build}"/>
-+        <javac
-+                srcdir="."
-+                includes="com/novell/**/*.java,jldap/com/novell/security/sasl/*.java,org/ietf/**/*.java"
-+                excludes="com/novell/services/**/*.java"
-+                destdir="${build}"
-+                encoding="UTF-8"
-+                target="1.6"
-+                source="1.6"
-+                deprecation="off"
-+                debug="off"
-+                optimize="on">
-+                <classpath>
-+                	<pathelement location="external/ssl/domestic/nssl1.2_dom.jar"/>
-+					<pathelement location="external/jsse/lib/jcert.jar"/>
-+					<pathelement location="external/jsse/lib/jnet.jar"/>
-+					<pathelement location="external/jsse/lib/jsse.jar"/>
-+					<pathelement location="external/commons-httpclient-2.0-rc2.jar"/>
-+                </classpath>
-+        </javac>
-+
-+        <echo message="Creating RELEASE ${lib}/${ldap}.jar file"/>
-+        <mkdir dir="${lib}"/>
-+        <jar jarfile="${lib}/${jldap}.jar"
-+            basedir="${build}"
-+        />
-     </target>
- 
--    <!-- =================================================================== -->
--    <!-- setup for javadoc                                                   -->
--    <!-- =================================================================== -->
--    <target name="setupDoc" depends="init">
--        <ant antfile="javac.xml" target="setupDebug">
--            <property name="DEBUG_VALUE" value="true"/>
--        </ant>
-+    <!-- ====================================================================== -->
-+    <!-- Test-compilation target                                                -->
-+    <!-- ====================================================================== -->
-+
-+    <target name="compile-tests" 
-+        description="Compile the test code">
-+        <mkdir dir="${build.testOutputDir}"/>
-+        <mkdir dir="${build.testResourceDir}"/>
-+        <javac destdir="${build.testOutputDir}" 
-+            encoding="UTF-8" 
-+            nowarn="false" 
-+            debug="true" 
-+            optimize="false" 
-+            deprecation="true" 
-+            target="1.6" 
-+            verbose="false" 
-+            fork="false" 
-+            source="1.6">
-+            <src>
-+                <pathelement location="${build.testDir}"/>
-+            </src>
-+            <classpath>
-+                <path refid="build.test.classpath"/>
-+                <pathelement location="${build.outputDir}"/>
-+            </classpath>
-+        </javac>
-+        <copy todir="${build.testOutputDir}">
-+            <fileset dir="${build.testResourceDir}"/>
-+        </copy>
-     </target>
- 
--    <!-- =================================================================== -->
--    <!-- final is synonym for build release classes                          -->
--    <!-- =================================================================== -->
--    <target name="final" depends="release" />
-+    <!-- ====================================================================== -->
-+    <!-- Run all tests                                                          -->
-+    <!-- ====================================================================== -->
-+
-+    <target name="test" 
-+        depends="compile-tests"
-+        description="Run the test cases">
-+        <mkdir dir="${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.test.classpath"/>
-+                <pathelement location="${build.outputDir}"/>
-+                <pathelement location="${build.testOutputDir}"/>
-+            </classpath>
-+            <batchtest todir="${test.reports}" unless="test">
-+                <fileset dir="${build.testDir}">
-+                    <include name="**/Test*.java"/>
-+                    <include name="**/*Test.java"/>
-+                    <include name="**/*TestCase.java"/>
-+                    <exclude name="**/*Abstract*Test.java"/>
-+                </fileset>
-+            </batchtest>
-+            <batchtest todir="${test.reports}" if="test">
-+                <fileset dir="${build.testDir}">
-+                    <include name="**/${test}.java"/>
-+                    <exclude name="**/*Abstract*Test.java"/>
-+                </fileset>
-+            </batchtest>
-+        </junit>
-+    </target>
-+
-+    <!-- END -->
- 
-     <!-- =================================================================== -->
-     <!-- build lib files                                                     -->
-     <!-- =================================================================== -->
--    <target name="lib" depends="debug, release"/>
-+    <target name="lib" depends="debug"/>
- 
-     <!-- =================================================================== -->
-     <!-- jar is synonym for build lib files                                  -->
-@@ -284,7 +405,7 @@
-     <!-- =================================================================== -->
-     <!-- create javadoc for Novell ldap classes                              -->
-     <!-- =================================================================== -->
--    <target name="docnovellldap" depends="init, setupDoc">
-+    <target name="docnovellldap" depends="init">
-         <delete dir="${pkg.doc}"/>
-         <echo message="Creating distribution ldap javadoc"/>
-         <mkdir dir="${pkg.doc}"/>
-@@ -305,7 +426,7 @@
-     <!-- =================================================================== -->
-     <!-- create javadoc for IETF ldap classes                                -->
-     <!-- =================================================================== -->
--    <target name="docietfldap" depends="init, setupDoc">
-+    <target name="docietfldap" depends="init">
-         <delete dir="${pkg.ietfdoc}"/>
-         <echo message="Creating distribution ldap javadoc"/>
-         <mkdir dir="${pkg.ietfdoc}"/>
-@@ -326,7 +447,7 @@
-     <!-- =================================================================== -->
-     <!-- create javadoc for all LDAP classes for internal developer use only -->
-     <!-- =================================================================== -->
--    <target name="docdeveloper" depends="init, setupDoc">
-+    <target name="docdeveloper" depends="init">
-         <delete dir="${pkg.developer}"/>
-         <echo message="Creating internal developer ldap javadoc"/>
-         <mkdir dir="${doc.developer}"/>
-@@ -335,6 +456,8 @@
-             destdir="${doc.developer}"
-             classpath="${lib.debug}/${ldap}.jar;external/jsse/lib/jcert.jar;external/jsse/lib/jnet.jar;external/jsse/lib/jsse.jar;external/jaxp/jaxp.jar;external/jaxp/xerces.jar"
-             packagenames="org.ietf.ldap,com.novell.security.sasl,com.novell.sasl.client,com.novell.ldap.asn1,com.novell.ldap.client,com.novell.ldap.rfc2251,com.novell.ldap.resources,com.novell.ldap.extensions,com.novell.ldap.controls,com.novell.ldap.util,com.novell.ldap"
-+            encoding="UTF-8"
-+            failonerror="no"
-             Windowtitle="LDAP Classes"
-             Splitindex="true"
-             Private="true"
diff --git a/dev-java/jldap/jldap-4.6.ebuild b/dev-java/jldap/jldap-4.6.ebuild
deleted file mode 100644
index 6802cd77b05b..000000000000
--- a/dev-java/jldap/jldap-4.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="LDAP Class Libraries for Java (JLDAP)"
-HOMEPAGE="http://www.openldap.org/jldap/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-CDEPEND="dev-java/openspml:0
-	dev-java/openspml2:0
-	dev-java/commons-httpclient:3
-	dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/zip
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="openspml,openspml2,commons-httpclient-3"
-
-EANT_BUILD_TARGET="release"
-EANT_BUILD_XML="build.xml"
-
-EANT_DOC_TARGET="docdeveloper"
-
-# [0]: complete rewrite of build.xml
-# [1]: disable debugging at compile time
-PATCHES=(
-	"${FILESDIR}"/${P}-build.xml.patch
-	"${FILESDIR}"/${P}-Debug.java.patch
-)
-
-java_prepare() {
-	epatch ${PATCHES[@]}
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
-EANT_TEST_TARGET="test"
-
-src_test() {
-	EANT_GENTOO_CLASSPATH_EXTRA="${S}/lib/${PN}.jar"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-
-	dodoc README README.dsml || die
-	dohtml *.html || die
-
-	if use doc; then
-		dodoc design/* || die
-		java-pkg_dojavadoc doc
-	fi
-
-	use source && java-pkg_dosrc org com
-}
diff --git a/dev-java/jldap/metadata.xml b/dev-java/jldap/metadata.xml
deleted file mode 100644
index 51858a58b008..000000000000
--- a/dev-java/jldap/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<maintainer>
-	<email>monsieurp@gentoo.org</email>
-</maintainer>
-<longdescription>
-	The LDAP Class Libraries for Java (JLDAP) enable you to write applications to
-	access, manage, update, and search for information stored in directories
-	accessible using LDAPv3. JLDAP was developed by Novell.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/openspml/Manifest b/dev-java/openspml/Manifest
deleted file mode 100644
index 044a6e5fc03d..000000000000
--- a/dev-java/openspml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openspml_v0.5.zip 6155674 SHA256 ab437e5cffb3ad22c6525ecafa142c99cf36c21aa30d974c9c9b3bb0ad9d5c4e SHA512 31302b72f79620c94dcb7299bee8f8fc481fd40e0b71ee9497be8a202b855469ca2f0a3a2959c67f269f426854b3d61c4e8c1188b33b9d8d6df5cc376049f38c WHIRLPOOL 08b927636d9dec19a4f07100ff61781c75e4a0346110bd3323dcf17d1e9f3214c8b176775441293ecf1b01799034775b4bc698ada6680983cd8cdc3634e93feb
diff --git a/dev-java/openspml/files/build.xml-0.5 b/dev-java/openspml/files/build.xml-0.5
deleted file mode 100644
index 4d8866254bf8..000000000000
--- a/dev-java/openspml/files/build.xml-0.5
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<project basedir="." default="jar">
-  <target name="compile">
-    <mkdir dir="bin"/>
-    <javac srcdir="src" destdir="bin">
-      <include name="**/*.java"/>
-      <classpath>
-        <fileset dir="lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="openspml.jar">
-      <zipfileset dir="bin"/>
-    </jar>
-  </target>
-</project>
diff --git a/dev-java/openspml/metadata.xml b/dev-java/openspml/metadata.xml
deleted file mode 100644
index 1f680fa5f4a1..000000000000
--- a/dev-java/openspml/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
diff --git a/dev-java/openspml/openspml-0.5-r1.ebuild b/dev-java/openspml/openspml-0.5-r1.ebuild
deleted file mode 100644
index a2448cb5901f..000000000000
--- a/dev-java/openspml/openspml-0.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Open source implementation of Service Provisioning Markup Language (SPML)"
-HOMEPAGE="http://www.openspml.org/"
-SRC_URI="http://www.openspml.org/Files/${PN}_v${PV}.zip"
-
-LICENSE="openspml"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-java/soap-2.3.1-r4:0
-		java-virtuals/javamail:0"
-
-RDEPEND="${CDEPEND}
-		>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="soap,javamail"
-JAVAC_ARGS="-source 1.4"
-
-java_prepare() {
-	rm -r "${S}"/src/org/openspml/test/ || die
-	rm "${S}"/lib/*.jar || die
-}
diff --git a/dev-java/openspml/openspml-0.5.ebuild b/dev-java/openspml/openspml-0.5.ebuild
deleted file mode 100644
index 3d1fbd96c9c3..000000000000
--- a/dev-java/openspml/openspml-0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Open source implementation of Service Provisioning Markup Language (SPML)"
-HOMEPAGE="http://www.openspml.org/"
-SRC_URI="http://www.openspml.org/Files/${PN}_v${PV}.zip"
-
-LICENSE="openspml"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.4"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-
-	unpack "${A}"
-
-	# Argh...
-	cd "${S}"
-	find . -type f -exec chmod 644 {} \;
-	find . -type d -exec chmod 755 {} \;
-
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml"
-
-}
-
-src_compile() {
-
-	cd "${S}/lib"
-
-	cd "${S}"
-	eant jar
-
-}
-
-src_install() {
-
-	java-pkg_dojar "${S}/lib/openspml.jar"
-
-	use source && java-pkg_dosrc "${S}/src/*"
-	dodoc README history.txt
-	use doc && java-pkg_dojavadoc doc
-
-}
diff --git a/dev-java/openspml2/Manifest b/dev-java/openspml2/Manifest
deleted file mode 100644
index 7c4413efd1e9..000000000000
--- a/dev-java/openspml2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openspml_v2-1.0rc2.tgz 2068049 SHA256 52bdd3a783a151b05bb285f6682fc91edfa0edeb93acc1370f37be0d0ec46b85 SHA512 8ec9f9831e7d5aedeb1ffc6deaba5f81ba96450902fad37fcaa1ee657fa73445383dcb9ed047a737e248b13ebaa67bab9216e52d22b7479f93fe62828f3215ac WHIRLPOOL 6c1c3cbe51710bc74fdd5f94f3efcabecb230e6e01c0966afe9d6d7ec8e8be91bcaa315e8bdf455cc2b3e444ac22b50c1f6deca6bf9d096b6af15492dad1435e
diff --git a/dev-java/openspml2/files/build.xml-1.0_rc2 b/dev-java/openspml2/files/build.xml-1.0_rc2
deleted file mode 100644
index c6dbb958f6fd..000000000000
--- a/dev-java/openspml2/files/build.xml-1.0_rc2
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<project basedir="." default="jar">
-  <target name="compile">
-    <mkdir dir="bin"/>
-    <javac srcdir="src/java/" destdir="bin">
-      <include name="**/*.java"/>
-      <classpath>
-        <fileset dir="lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="openspml2.jar">
-      <zipfileset dir="bin"/>
-    </jar>
-  </target>
-</project>
diff --git a/dev-java/openspml2/metadata.xml b/dev-java/openspml2/metadata.xml
deleted file mode 100644
index 1f680fa5f4a1..000000000000
--- a/dev-java/openspml2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
diff --git a/dev-java/openspml2/openspml2-1.0_rc2.ebuild b/dev-java/openspml2/openspml2-1.0_rc2.ebuild
deleted file mode 100644
index f91f5c253483..000000000000
--- a/dev-java/openspml2/openspml2-1.0_rc2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Open source implementation of Service Provisioning Markup Language (SPML)"
-HOMEPAGE="http://www.openspml.org/"
-SRC_URI="http://www.openspml.org/Files/openspml_v2-${MY_PV}.tgz"
-
-LICENSE="CDDL-Schily"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc source"
-
-COMMON_DEP="
-	=dev-java/servletapi-2.4*
-	dev-java/openspml"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-
-	unpack "${A}"
-	cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
-
-	rm -f "${S}/lib/*"
-
-}
-
-src_compile() {
-
-	cd "${S}/lib"
-	rm -f *.jar
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from openspml
-
-	cd "${S}"
-	eant jar
-
-}
-
-src_install() {
-
-	java-pkg_dojar "${S}/openspml2.jar"
-
-	use source && java-pkg_dosrc "${S}/src/java/*"
-	use doc && {
-		java-pkg_dohtml -r docs/api
-		dodoc docs/ToolkitOverview.html
-		dodoc docs/DSML_2.0_Profile_Overview.txt
-	}
-
-}
diff --git a/dev-java/soap/Manifest b/dev-java/soap/Manifest
deleted file mode 100644
index 40f29eef70cc..000000000000
--- a/dev-java/soap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST soap-src-2.3.1.tar.gz 142925 SHA256 4b580107a4026801c29975668e03c6fe959662086d910da979450eae2f808c87 SHA512 b289f8399b15e28ee2b7fa6c42fe56ee0cf42ed8202c234cfca2c3f2a877518e04a29af2fe07f140d8ac23bd6b19607964b79757f6c9733c0be746e3eaadcbce WHIRLPOOL a0e696fee2e187f111a1323c77fde3ce4c0d05f37e8595d5316cb62d563fac23a8e87c91013e65372091c8ace3a5c6da2c5658c1b77d0412736cd7d906bc5ff6
diff --git a/dev-java/soap/files/soap-2.3.1-build.xml.patch b/dev-java/soap/files/soap-2.3.1-build.xml.patch
deleted file mode 100644
index 4e8ebd52547f..000000000000
--- a/dev-java/soap/files/soap-2.3.1-build.xml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.orig	2006-12-11 03:00:56.000000000 +0100
-+++ build.xml	2006-12-11 03:03:36.000000000 +0100
-@@ -92,7 +92,8 @@
-   <!-- =================================================================== -->
-   <target name="prepare" depends="init">
-     <mkdir dir="${build.dir}"/>
--    <available property="bsf.present" classname="com.ibm.bsf.BSFManager" />
-+    <!--
-+	<available property="bsf.present" classname="com.ibm.bsf.BSFManager" />
-     <available property="xmi.present" classname="com.ibm.xmi.job.Job" />
-     <available property="pop3.present" 
-       classname="com.ibm.network.mail.pop3.event.StatusListener" />
-@@ -101,6 +102,7 @@
-     <available property="ejb.present" classname="javax.ejb.SessionBean" />
-     <available property="ssl.present" classname="javax.net.ssl.SSLSocket" />
-     <available property="junit.present" classname="junit.framework.TestCase" />
-+	-->
- 
- 
-     <uptodate property="javac.notRequired"
-@@ -173,7 +175,7 @@
-           depends="prepare"
-           description="Compiles the source files.">
-     <mkdir dir="${build.dest}"/>
--    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">
-+    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${gentoo.classpath}">
-       <patternset refid="javac.source.files"/>
-     </javac>
- 
diff --git a/dev-java/soap/files/soap-2.3.1-java7-enum.patch b/dev-java/soap/files/soap-2.3.1-java7-enum.patch
deleted file mode 100644
index 65d74c4060d9..000000000000
--- a/dev-java/soap/files/soap-2.3.1-java7-enum.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git a/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java b/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
-index 61c9b6a..ac603b3 100644
---- a/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
-+++ b/soap-2_3_1/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
-@@ -92,7 +92,7 @@ public class VectorSerializer implements Serializer, Deserializer
-                         src.getClass().toString() + "' to VectorSerializer");
- 
-         String lengthStr;
--        Enumeration enum;
-+        Enumeration enumx;
-         
-         if (src instanceof Enumeration) {
-                 /** TODO: Right now we don't include a length on Enumerations,
-@@ -100,11 +100,11 @@ public class VectorSerializer implements Serializer, Deserializer
-                  * doing the length calculation (at the cost of traversing the
-                  * Enumeration) for a particular installation/service/call.
-                  */
--                enum = (Enumeration)src;
-+                enumx = (Enumeration)src;
-                 lengthStr = "";
-         } else {
-                 Vector v = (Vector)src;
--                enum = v.elements();
-+                enumx = v.elements();
-         
-                 lengthStr = src != null
-                        ? v.size() + ""
-@@ -132,7 +132,7 @@ public class VectorSerializer implements Serializer, Deserializer
- 
-       sink.write(StringUtils.lineSeparator);
- 
--      for (Enumeration e = enum; e.hasMoreElements(); )
-+      for (Enumeration e = enumx; e.hasMoreElements(); )
-       {
-         nsStack.pushScope();
- 
-diff --git a/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java b/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
-index 8d9e773..6498e05 100644
---- a/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
-+++ b/soap-2_3_1/src/org/apache/soap/providers/StatefulEJBProvider.java
-@@ -189,8 +189,8 @@ public class StatefulEJBProvider implements Provider {
-         remoteObjRef = (Remote) ret.getValue();
-       } catch (ClassCastException cce) {
-         // Try to cast to an enumeration:
--        Enumeration enum = (Enumeration) ret.getValue();
--        remoteObjRef = (Remote) enum.nextElement();
-+        Enumeration enumx = (Enumeration) ret.getValue();
-+        remoteObjRef = (Remote) enumx.nextElement();
-       }
-       // Set the return value to null, so that the remote object is not
-       // included in the response destined for the client.
-diff --git a/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java b/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
-index bbf3021..533223f 100644
---- a/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
-+++ b/soap-2_3_1/src/org/apache/soap/server/http/MessageRouterServlet.java
-@@ -160,10 +160,10 @@ public class MessageRouterServlet extends HttpServlet {
-       if (factory != null) {
-         try {
-           Properties props = new Properties();
--          Enumeration enum = servletConfig.getInitParameterNames();
-+          Enumeration enumx = servletConfig.getInitParameterNames();
- 
--          while (enum.hasMoreElements()) {
--            String name = (String)enum.nextElement();
-+          while (enumx.hasMoreElements()) {
-+            String name = (String)enumx.nextElement();
- 
-             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)
-                 && !Constants.XML_PARSER.equals(name)) {
-diff --git a/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java b/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
-index b723d4a..ac6a75c 100644
---- a/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
-+++ b/soap-2_3_1/src/org/apache/soap/server/http/RPCRouterServlet.java
-@@ -178,10 +178,10 @@ public class RPCRouterServlet extends HttpServlet {
- 	  /*First we put in the servletContext parameters, and then
- 	    overwrite them with the servletConfig parameters if 
- 	    they are present.*/
--          Enumeration enum = servletContext.getInitParameterNames();
-+          Enumeration enumx = servletContext.getInitParameterNames();
- 	  
--          while (enum.hasMoreElements()) {
--            String name = (String)enum.nextElement();
-+          while (enumx.hasMoreElements()) {
-+            String name = (String)enumx.nextElement();
- 
-             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)
-                 && !Constants.XML_PARSER.equals(name)) {
-@@ -189,10 +189,10 @@ public class RPCRouterServlet extends HttpServlet {
-             }
-           }
- 
--          enum = servletConfig.getInitParameterNames();
-+          enumx = servletConfig.getInitParameterNames();
- 
--          while (enum.hasMoreElements()) {
--            String name = (String)enum.nextElement();
-+          while (enumx.hasMoreElements()) {
-+            String name = (String)enumx.nextElement();
- 
-             if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)
-                 && !Constants.XML_PARSER.equals(name)) {
-diff --git a/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java b/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
-index 6e7530d..cf6c3e4 100644
---- a/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
-+++ b/soap-2_3_1/src/org/apache/soap/transport/http/SOAPHTTPConnection.java
-@@ -397,8 +397,8 @@ public class SOAPHTTPConnection implements SOAPTransport {
-    */
-   private static String getHeaderValue (Hashtable headers, String headerName)
-   {
--    for (Enumeration enum = headers.keys (); enum.hasMoreElements ();) {
--      String key = (String) enum.nextElement();
-+    for (Enumeration enumx = headers.keys (); enumx.hasMoreElements ();) {
-+      String key = (String) enumx.nextElement();
- 
-       if (key.equalsIgnoreCase (headerName)) {
-         return (String) headers.get(key);
diff --git a/dev-java/soap/metadata.xml b/dev-java/soap/metadata.xml
deleted file mode 100644
index 1f680fa5f4a1..000000000000
--- a/dev-java/soap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
diff --git a/dev-java/soap/soap-2.3.1-r3.ebuild b/dev-java/soap/soap-2.3.1-r3.ebuild
deleted file mode 100644
index 5dd5334a4cab..000000000000
--- a/dev-java/soap/soap-2.3.1-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 versionator
-
-DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
-HOMEPAGE="http://ws.apache.org/soap/"
-SRC_URI="http://archive.apache.org/dist/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	java-virtuals/jaf:0
-	java-virtuals/javamail:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="
-	>=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND="
-	>=virtual/jdk-1.4
-	${CDEPEND}"
-
-S="${WORKDIR}"/${PN}-$(replace_all_version_separators _)
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-java_prepare() {
-	# get rid of automagical tests, add gentoo.classpath to <javac>
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-EANT_GENTOO_CLASSPATH="javamail,jaf,servlet-api-3.0"
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_register-optional-dependency xerces-2
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/soap/soap-2.3.1-r4.ebuild b/dev-java/soap/soap-2.3.1-r4.ebuild
deleted file mode 100644
index 3604a800a021..000000000000
--- a/dev-java/soap/soap-2.3.1-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 versionator
-
-DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
-HOMEPAGE="http://ws.apache.org/soap/"
-SRC_URI="http://archive.apache.org/dist/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	java-virtuals/jaf:0
-	java-virtuals/javamail:0
-	java-virtuals/servlet-api:3.0"
-RDEPEND="
-	>=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND="
-	>=virtual/jdk-1.4
-	${CDEPEND}"
-
-S="${WORKDIR}"/${PN}-$(replace_all_version_separators _)
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-java_prepare() {
-	# get rid of automagical tests, add gentoo.classpath to <javac>
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-	epatch "${FILESDIR}/${P}-java7-enum.patch"
-}
-
-EANT_GENTOO_CLASSPATH="javamail,jaf,servlet-api-3.0"
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_register-optional-dependency xerces-2
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use source && java-pkg_dosrc src/org
-}