Forgot to include patch.

Package-Manager: portage-2.1.2_pre3-r4

3 files changed, 60 insertions, 5 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index ee6e66a90844..947068419f83 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.41 2006/10/25 13:31:57 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.42 2006/10/25 16:29:07 nichoj Exp $
+
+  25 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/commons-logging-1.1-servletapi.patch:
+  Forgot to include patch.
 
 *commons-logging-1.1-r2 (25 Oct 2006)
 
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 68e8c04ea4bf..47e2d5e9909d 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,3 +1,7 @@
+AUX commons-logging-1.1-servletapi.patch 1988 RMD160 78c13fc15add613a1cb17d73c3a31c8ee1cc69bd SHA1 cab5198471596f46a2faae282e8c6a8f786cbf51 SHA256 836afb926d95aae2dcade9234179df3274402f19bbcc54d77a19e18af30317b3
+MD5 41b91178077c9e3dc891ece05c835d99 files/commons-logging-1.1-servletapi.patch 1988
+RMD160 78c13fc15add613a1cb17d73c3a31c8ee1cc69bd files/commons-logging-1.1-servletapi.patch 1988
+SHA256 836afb926d95aae2dcade9234179df3274402f19bbcc54d77a19e18af30317b3 files/commons-logging-1.1-servletapi.patch 1988
 DIST commons-logging-1.0.4-src.tar.gz 101017 RMD160 9d92e16433e858fc1c2db7b9c65b07ed11ad28fc SHA1 5bea5faa3b45251d97655b37ce00f80678f9db62 SHA256 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482
 DIST commons-logging-1.1-src.tar.gz 173556 RMD160 5764ee09a541365adee55aded1a9ba8908deea0d SHA1 cbaf5c65979e6733b07b27b01af083965a55fbad SHA256 56aa7d3f2ab3d50798ce618d6dd60ed6814287f7cc25802d403cd3083238c5fa
 EBUILD commons-logging-1.0.4-r1.ebuild 1548 RMD160 7f65155371f196f03c23ed696d01ae4eb639bf4b SHA1 10c1890d8d49fae3a4ede4d39cb9e0a37a5cc14b SHA256 bc26dc45f3732e2557e2a06e6d04e4bae500c759597af31e09c69e24a5da6a9f
@@ -12,10 +16,10 @@ EBUILD commons-logging-1.1-r2.ebuild 2114 RMD160 36ee4bf4361ad67a54d74e35ec7f93b
 MD5 e5eace0e384e13ae8b1da2478ff4bfce commons-logging-1.1-r2.ebuild 2114
 RMD160 36ee4bf4361ad67a54d74e35ec7f93b093ea99a2 commons-logging-1.1-r2.ebuild 2114
 SHA256 901a0e760f15206454adc7700a4b76399452cdc24a6d65bf81c79817d6a16e2a commons-logging-1.1-r2.ebuild 2114
-MISC ChangeLog 5758 RMD160 6a484dcf7c45aa15ea9d6b4efc50ad9150b416f3 SHA1 a33c8b1936e8dc9a428b6c5b65f6da4ced91e2a1 SHA256 4782d9cb79788132260e5b85e9a355bbd32092fe598274c3dd3a4482842915f7
-MD5 e048167a31ce12562ba83db68c87503b ChangeLog 5758
-RMD160 6a484dcf7c45aa15ea9d6b4efc50ad9150b416f3 ChangeLog 5758
-SHA256 4782d9cb79788132260e5b85e9a355bbd32092fe598274c3dd3a4482842915f7 ChangeLog 5758
+MISC ChangeLog 5883 RMD160 39543059da9de26e15a2eb3d60f3f635ccf18c91 SHA1 99a5efc626de379bd8f7870f4883d87add04a423 SHA256 3bb0af7299086180324b6ebd08415721c1a35fa1b9adeaaa07ad0fb23a51adad
+MD5 223bc2db11ab4b3f0ed3746b5c4971c1 ChangeLog 5883
+RMD160 39543059da9de26e15a2eb3d60f3f635ccf18c91 ChangeLog 5883
+SHA256 3bb0af7299086180324b6ebd08415721c1a35fa1b9adeaaa07ad0fb23a51adad ChangeLog 5883
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
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
new file mode 100644
index 000000000000..0045cd195b0f
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
@@ -0,0 +1,47 @@
+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