diff --git a/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch
deleted file mode 100644
index 06ac54cdb79f0..0000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- build.xml.original	2006-10-01 18:15:11.000000000 +0200
-+++ build.xml	2006-10-01 18:36:46.000000000 +0200
-@@ -772,5 +772,23 @@
-       One or more unit tests failed.
-     </fail>
-   </target>
--
-+  <target name="javadoc" description="o Generate javadoc" depends="">
-+    <mkdir dir="${build.home}/docs">
-+    </mkdir>
-+    <tstamp>
-+      <format pattern="2001-yyyy" property="year">
-+      </format>
-+    </tstamp>
-+    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved.">
-+    </property>
-+    <property name="title" value="Logging 1.1 API">
-+    </property>
-+    <javadoc use="true" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.logging.*">
-+      <classpath>
-+        <path refid="javadoc.classpath">
-+        </path>
-+      </classpath>
-+    </javadoc>
-+  </target>
-+ 
- </project>
diff --git a/dev-java/commons-logging/files/commons-logging-1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1-manifest
deleted file mode 100644
index 09d24e8e88a7f..0000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1-manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.apache.commons.logging
-Bundle-Version: 1.1
-Export-Package: org.apache.commons.logging;version="1.1",org.apache.commons.logging.impl;version="1.1"
diff --git a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
deleted file mode 100644
index 0045cd195b0fa..0000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru commons-logging-1.1-src/build.xml commons-logging-1.1-src-patched/build.xml
---- commons-logging-1.1-src/build.xml	2006-05-09 17:45:08.000000000 -0400
-+++ commons-logging-1.1-src-patched/build.xml	2006-10-20 01:16:51.000000000 -0400
-@@ -274,6 +274,10 @@
-                classpathref="compile.classpath"
-                classname="org.apache.log.Logger"/>
- 
-+	<available property="servletapi.present"
-+		   	   classpathref="compile.classpath"
-+			   classname="javax.servlet.ServletContextEvent"/>
-+
-     <available property="avalon-framework.present"
-                classpathref="compile.classpath"
-                classname="org.apache.avalon.framework.logger.Logger"/>
-@@ -303,6 +307,13 @@
-     -->
-   </target>
-   
-+  <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
-+    <echo>
-+    *** WARNING ***
-+    ServletAPI not found: Cannot Build ServletContextCleaner
-+	</echo>
-+  </target>
-+
-   <target name="logkit-warning" unless='logkit.present' depends='init,discovery'>
-     <echo>
-     *** WARNING ***
-@@ -332,7 +343,7 @@
-   </target>
-     
-   <target name='warning' 
--    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
-+    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
- 
-   <target name="compile-only" 
-     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
-@@ -360,6 +371,8 @@
-     
-       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
- 
-+	  <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
-+	  		   unless="servletapi.present"/>
-       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
-                unless="jdk.1.4.present"/>
-       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
-Only in commons-logging-1.1-src-patched/: target
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch
deleted file mode 100644
index 6d468735d0e7e..0000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- build.xml.orig	2008-02-06 16:09:59.000000000 +0100
-+++ build.xml	2008-02-06 16:10:48.000000000 +0100
-@@ -785,4 +785,23 @@
-     </fail>
-   </target>
- 
-+  <target name="javadoc" description="o Generate javadoc" depends="">
-+    <mkdir dir="${build.home}/docs">
-+    </mkdir>
-+    <tstamp>
-+      <format pattern="2001-yyyy" property="year">
-+      </format>
-+    </tstamp>
-+    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved.">
-+    </property>
-+    <property name="title" value="Logging 1.1 API">
-+    </property>
-+    <javadoc use="true" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.logging.*">
-+      <classpath>
-+        <path refid="javadoc.classpath">
-+        </path>
-+      </classpath>
-+    </javadoc>
-+  </target>
-+
- </project>
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
deleted file mode 100644
index 382da7a047e53..0000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %bundleName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Bundle-SymbolicName: org.apache.commons.logging
-Bundle-Version: 1.1.1
-Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1"
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
deleted file mode 100644
index 2c29fa544019b..0000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- build.xml.orig2	2008-02-06 16:13:45.000000000 +0100
-+++ build.xml	2008-02-06 16:16:48.000000000 +0100
-@@ -276,6 +276,11 @@
-                classpathref="compile.classpath"
-                classname="org.apache.log.Logger"/>
- 
-+	<available property="servletapi.present"
-+		   	   classpathref="compile.classpath"
-+			   classname="javax.servlet.ServletContextEvent"/>
-+
-+
-     <available property="avalon-framework.present"
-                classpathref="compile.classpath"
-                classname="org.apache.avalon.framework.logger.Logger"/>
-@@ -312,6 +317,13 @@
-     </echo>
-   </target>
-   
-+  <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
-+    <echo>
-+    *** WARNING ***
-+    ServletAPI not found: Cannot Build ServletContextCleaner
-+	</echo>
-+  </target>
-+
-   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
-     <echo>
-     *** WARNING ***
-@@ -334,7 +346,7 @@
-   </target>
-     
-   <target name='warning' 
--    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
-+    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
- 
-   <target name="compile-only" 
-     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
-@@ -362,6 +374,8 @@
-     
-       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
- 
-+	  <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
-+	  		   unless="servletapi.present"/>
-       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
-                unless="jdk.1.4.present"/>
-       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"