1 |
commit: d02017503f820ff10510f8ced8b6147e61377ad8 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 09:04:18 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 09:04:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0201750 |
7 |
|
8 |
dev-java/commons-logging: Remove old files |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
.../files/commons-logging-1.1-gentoo.patch | 27 ------------- |
13 |
.../files/commons-logging-1.1-manifest | 8 ---- |
14 |
.../files/commons-logging-1.1-servletapi.patch | 47 ---------------------- |
15 |
.../files/commons-logging-1.1.1-gentoo.patch | 26 ------------ |
16 |
.../files/commons-logging-1.1.1-manifest | 8 ---- |
17 |
.../files/commons-logging-1.1.1-servletapi.patch | 46 --------------------- |
18 |
6 files changed, 162 deletions(-) |
19 |
|
20 |
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 |
21 |
deleted file mode 100644 |
22 |
index 06ac54c..0000000 |
23 |
--- a/dev-java/commons-logging/files/commons-logging-1.1-gentoo.patch |
24 |
+++ /dev/null |
25 |
@@ -1,27 +0,0 @@ |
26 |
---- build.xml.original 2006-10-01 18:15:11.000000000 +0200 |
27 |
-+++ build.xml 2006-10-01 18:36:46.000000000 +0200 |
28 |
-@@ -772,5 +772,23 @@ |
29 |
- One or more unit tests failed. |
30 |
- </fail> |
31 |
- </target> |
32 |
-- |
33 |
-+ <target name="javadoc" description="o Generate javadoc" depends=""> |
34 |
-+ <mkdir dir="${build.home}/docs"> |
35 |
-+ </mkdir> |
36 |
-+ <tstamp> |
37 |
-+ <format pattern="2001-yyyy" property="year"> |
38 |
-+ </format> |
39 |
-+ </tstamp> |
40 |
-+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> |
41 |
-+ </property> |
42 |
-+ <property name="title" value="Logging 1.1 API"> |
43 |
-+ </property> |
44 |
-+ <javadoc use="true" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.logging.*"> |
45 |
-+ <classpath> |
46 |
-+ <path refid="javadoc.classpath"> |
47 |
-+ </path> |
48 |
-+ </classpath> |
49 |
-+ </javadoc> |
50 |
-+ </target> |
51 |
-+ |
52 |
- </project> |
53 |
|
54 |
diff --git a/dev-java/commons-logging/files/commons-logging-1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1-manifest |
55 |
deleted file mode 100644 |
56 |
index 09d24e8..0000000 |
57 |
--- a/dev-java/commons-logging/files/commons-logging-1.1-manifest |
58 |
+++ /dev/null |
59 |
@@ -1,8 +0,0 @@ |
60 |
-Manifest-Version: 1.0 |
61 |
-Bundle-ManifestVersion: 2 |
62 |
-Bundle-Name: %bundleName |
63 |
-Bundle-Vendor: %vendorName |
64 |
-Bundle-Localization: plugin |
65 |
-Bundle-SymbolicName: org.apache.commons.logging |
66 |
-Bundle-Version: 1.1 |
67 |
-Export-Package: org.apache.commons.logging;version="1.1",org.apache.commons.logging.impl;version="1.1" |
68 |
|
69 |
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 |
70 |
deleted file mode 100644 |
71 |
index 0045cd1..0000000 |
72 |
--- a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch |
73 |
+++ /dev/null |
74 |
@@ -1,47 +0,0 @@ |
75 |
-diff -ru commons-logging-1.1-src/build.xml commons-logging-1.1-src-patched/build.xml |
76 |
---- commons-logging-1.1-src/build.xml 2006-05-09 17:45:08.000000000 -0400 |
77 |
-+++ commons-logging-1.1-src-patched/build.xml 2006-10-20 01:16:51.000000000 -0400 |
78 |
-@@ -274,6 +274,10 @@ |
79 |
- classpathref="compile.classpath" |
80 |
- classname="org.apache.log.Logger"/> |
81 |
- |
82 |
-+ <available property="servletapi.present" |
83 |
-+ classpathref="compile.classpath" |
84 |
-+ classname="javax.servlet.ServletContextEvent"/> |
85 |
-+ |
86 |
- <available property="avalon-framework.present" |
87 |
- classpathref="compile.classpath" |
88 |
- classname="org.apache.avalon.framework.logger.Logger"/> |
89 |
-@@ -303,6 +307,13 @@ |
90 |
- --> |
91 |
- </target> |
92 |
- |
93 |
-+ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery"> |
94 |
-+ <echo> |
95 |
-+ *** WARNING *** |
96 |
-+ ServletAPI not found: Cannot Build ServletContextCleaner |
97 |
-+ </echo> |
98 |
-+ </target> |
99 |
-+ |
100 |
- <target name="logkit-warning" unless='logkit.present' depends='init,discovery'> |
101 |
- <echo> |
102 |
- *** WARNING *** |
103 |
-@@ -332,7 +343,7 @@ |
104 |
- </target> |
105 |
- |
106 |
- <target name='warning' |
107 |
-- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/> |
108 |
-+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/> |
109 |
- |
110 |
- <target name="compile-only" |
111 |
- depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/> |
112 |
-@@ -360,6 +371,8 @@ |
113 |
- |
114 |
- <exclude name="org/apache/commons/logging/impl/Log4J*.java"/> |
115 |
- |
116 |
-+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java" |
117 |
-+ unless="servletapi.present"/> |
118 |
- <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" |
119 |
- unless="jdk.1.4.present"/> |
120 |
- <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java" |
121 |
-Only in commons-logging-1.1-src-patched/: target |
122 |
|
123 |
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 |
124 |
deleted file mode 100644 |
125 |
index 6d46873..0000000 |
126 |
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch |
127 |
+++ /dev/null |
128 |
@@ -1,26 +0,0 @@ |
129 |
---- build.xml.orig 2008-02-06 16:09:59.000000000 +0100 |
130 |
-+++ build.xml 2008-02-06 16:10:48.000000000 +0100 |
131 |
-@@ -785,4 +785,23 @@ |
132 |
- </fail> |
133 |
- </target> |
134 |
- |
135 |
-+ <target name="javadoc" description="o Generate javadoc" depends=""> |
136 |
-+ <mkdir dir="${build.home}/docs"> |
137 |
-+ </mkdir> |
138 |
-+ <tstamp> |
139 |
-+ <format pattern="2001-yyyy" property="year"> |
140 |
-+ </format> |
141 |
-+ </tstamp> |
142 |
-+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> |
143 |
-+ </property> |
144 |
-+ <property name="title" value="Logging 1.1 API"> |
145 |
-+ </property> |
146 |
-+ <javadoc use="true" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.logging.*"> |
147 |
-+ <classpath> |
148 |
-+ <path refid="javadoc.classpath"> |
149 |
-+ </path> |
150 |
-+ </classpath> |
151 |
-+ </javadoc> |
152 |
-+ </target> |
153 |
-+ |
154 |
- </project> |
155 |
|
156 |
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 |
157 |
deleted file mode 100644 |
158 |
index 382da7a..0000000 |
159 |
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-manifest |
160 |
+++ /dev/null |
161 |
@@ -1,8 +0,0 @@ |
162 |
-Manifest-Version: 1.0 |
163 |
-Bundle-ManifestVersion: 2 |
164 |
-Bundle-Name: %bundleName |
165 |
-Bundle-Vendor: %vendorName |
166 |
-Bundle-Localization: plugin |
167 |
-Bundle-SymbolicName: org.apache.commons.logging |
168 |
-Bundle-Version: 1.1.1 |
169 |
-Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1" |
170 |
|
171 |
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 |
172 |
deleted file mode 100644 |
173 |
index 2c29fa5..0000000 |
174 |
--- a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch |
175 |
+++ /dev/null |
176 |
@@ -1,46 +0,0 @@ |
177 |
---- build.xml.orig2 2008-02-06 16:13:45.000000000 +0100 |
178 |
-+++ build.xml 2008-02-06 16:16:48.000000000 +0100 |
179 |
-@@ -276,6 +276,11 @@ |
180 |
- classpathref="compile.classpath" |
181 |
- classname="org.apache.log.Logger"/> |
182 |
- |
183 |
-+ <available property="servletapi.present" |
184 |
-+ classpathref="compile.classpath" |
185 |
-+ classname="javax.servlet.ServletContextEvent"/> |
186 |
-+ |
187 |
-+ |
188 |
- <available property="avalon-framework.present" |
189 |
- classpathref="compile.classpath" |
190 |
- classname="org.apache.avalon.framework.logger.Logger"/> |
191 |
-@@ -312,6 +317,13 @@ |
192 |
- </echo> |
193 |
- </target> |
194 |
- |
195 |
-+ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery"> |
196 |
-+ <echo> |
197 |
-+ *** WARNING *** |
198 |
-+ ServletAPI not found: Cannot Build ServletContextCleaner |
199 |
-+ </echo> |
200 |
-+ </target> |
201 |
-+ |
202 |
- <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'> |
203 |
- <echo> |
204 |
- *** WARNING *** |
205 |
-@@ -334,7 +346,7 @@ |
206 |
- </target> |
207 |
- |
208 |
- <target name='warning' |
209 |
-- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/> |
210 |
-+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/> |
211 |
- |
212 |
- <target name="compile-only" |
213 |
- depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/> |
214 |
-@@ -362,6 +374,8 @@ |
215 |
- |
216 |
- <exclude name="org/apache/commons/logging/impl/Log4J*.java"/> |
217 |
- |
218 |
-+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java" |
219 |
-+ unless="servletapi.present"/> |
220 |
- <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" |
221 |
- unless="jdk.1.4.present"/> |
222 |
- <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java" |