diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
index 52731a074785d..43c8968b4bd29 100644
--- a/dev-java/commons-discovery/Manifest
+++ b/dev-java/commons-discovery/Manifest
@@ -1,2 +1 @@
-DIST commons-discovery-0.4-src.tar.gz 78453 SHA256 596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3 SHA512 337db71167534785471b540bd89107a16e146bee4094ed746feb68fd1efa7697c0f629f24e63fb760f6c664d98f35d97ee71ca114a26d17ae078bf27459b1705 WHIRLPOOL 7608a0d99955c464b7a62fab615a6ec5b8a782c59c2dacb2440d2a5f6e681ec998583ffa4af51bdbb08a88c4f66bc4ecf736969a67ca7ff53da3eae6b482031e
 DIST commons-discovery-0.5.jar 81725 SHA256 c7ff18e5004b7e2bd12f5d1987481849a54188f911ec465c47c32e08580b6d7a SHA512 348e42df5e4e34fdaa49d638018e654119a9d4e2aad967ed2a6f2706e89ffb2ea5daa9ac86747fa1f6d7b245759fac1a80090c571a057be1cdf8cea3514936f3 WHIRLPOOL 6ecf2367a6e71c14acd11a421dccf16239e3c54769fcdf00fed5f8ea5ea922e289acb663549aa5d845833e9b4ddfb29353cee092b1a9dad992e6b92bf957e0d1
diff --git a/dev-java/commons-discovery/commons-discovery-0.4.ebuild b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
deleted file mode 100644
index f0585c7163691..0000000000000
--- a/dev-java/commons-discovery/commons-discovery-0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons Discovery: Service Discovery component"
-HOMEPAGE="http://commons.apache.org/discovery/"
-SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc source test"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-logging"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	test? ( =dev-java/junit-3* )"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# https://issues.apache.org/jira/browse/DISCOVERY-10
-	epatch "${FILESDIR}/0.4-jar-target.patch"
-}
-
-src_compile() {
-	java-pkg-2_src_compile \
-		-Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
-}
-
-src_test() {
-	eant test.discovery \
-		-Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" \
-		-Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	dodoc NOTICE.txt RELEASE-NOTES.txt || die
-
-	use doc && 	java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-discovery/files/0.4-jar-target.patch b/dev-java/commons-discovery/files/0.4-jar-target.patch
deleted file mode 100644
index 7cc3c983efe6c..0000000000000
--- a/dev-java/commons-discovery/files/0.4-jar-target.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: build.xml
-===================================================================
---- build.xml	(revision 498103)
-+++ build.xml	(working copy)
-@@ -175,23 +175,26 @@
-     </javadoc>
-   </target>
- 
-+  <target name="jar" depends="compile"
-+   description="Create the jar file">
-+    <mkdir      dir="${build.home}/classes/META-INF"/>
-+    <copy      file="LICENSE.txt"
-+             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-+    <copy      file="NOTICE.txt"
-+             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-+    <mkdir      dir="${dist.home}"/>
-+    <jar   jarfile="${dist.home}/${component.name}.jar"
-+           basedir="${build.home}/classes"
-+          manifest="${build.home}/conf/MANIFEST.MF"/>
-+  </target>
- 
--  <target name="dist" depends="compile,javadoc"
-+  <target name="dist" depends="jar,javadoc"
-    description="Create binary distribution">
-     <!-- TODO: top level files like LICENSE and README -->
--    <mkdir      dir="${dist.home}"/>
-     <copy      file="LICENSE.txt"
-               todir="${dist.home}"/>
-     <copy      file="NOTICE.txt"
-               todir="${dist.home}"/>
--    <mkdir      dir="${build.home}/classes/META-INF"/>
--    <copy      file="LICENSE.txt"
--             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
--    <copy      file="NOTICE.txt"
--             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
--    <jar    jarfile="${dist.home}/${component.name}.jar"
--            basedir="${build.home}/classes"
--           manifest="${build.home}/conf/MANIFEST.MF"/>
-   </target>
- 
- <!-- ========== Testing section ======================================== -->
diff --git a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff b/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff
deleted file mode 100644
index b55e10f5a0c29..0000000000000
--- a/dev-java/commons-discovery/files/commons-discovery-0.2-gentoo.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- build.xml.orig	2005-04-17 16:14:52.000000000 +0200
-+++ build.xml	2005-04-17 16:14:57.000000000 +0200
-@@ -14,13 +14,15 @@
-   <property file="../build.properties"/>             <!-- Commons local     -->
-   <property file="${user.home}/build.properties"/>   <!-- User local        -->
- 
-+  <!-- The base directory for compilation targets -->
-+  <property name="build.home"              value="target"/>
- 
- <!-- ========== External Dependencies ===================================== -->
- 
- 
-   <!-- The directories corresponding to your necessary dependencies -->
--  <property name="junit.jar"               value="../../junit3.7/junit.jar"/>
--  <property name="logger.jar"               value="../../jakarta-commons/logging/target/commons-logging.jar"/>
-+  <property name="junit.jar"               value="${build.home}/lib/junit.jar"/>
-+  <property name="logger.jar"               value="${build.home}/lib/commons-logging.jar"/>
- 
- 
- <!-- ========== Component Declarations ==================================== -->
-@@ -38,8 +40,6 @@
-   <!-- The current version number of this component -->
-   <property name="component.version"       value="0.2"/>
- 
--  <!-- The base directory for compilation targets -->
--  <property name="build.home"              value="target"/>
- 
-   <!-- The base directory for component configuration files -->
-   <property name="conf.home"               value="src/conf"/>
-@@ -116,6 +116,7 @@
- 
-  
-   <target name="compile" depends="prepare" description="Compile shareable components">
-+ 
-     <javac  srcdir="${source.home}"
-            destdir="${build.home}/classes"
-              debug="${compile.debug}"
-@@ -163,10 +164,10 @@
-    description="Create binary distribution">
-     <!-- TODO: top level files like LICENSE and README -->
-     <mkdir      dir="${dist.home}"/>
--    <copy      file="../LICENSE"
--              todir="${dist.home}"/>
-+    <!--<copy      file="LICENSE"
-+              todir="${dist.home}"/>-->
-     <mkdir      dir="${build.home}/classes/META-INF"/>
--    <copy      file="../LICENSE"
-+    <copy      file="LICENSE.txt"
-              tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-     <jar    jarfile="${dist.home}/commons-${component.name}.jar"
-             basedir="${build.home}/classes"