1 |
wltjr 07/11/03 02:01:25 |
2 |
|
3 |
Modified: ChangeLog tomcat-servlet-api-5.5.25.ebuild |
4 |
tomcat-servlet-api-6.0.14.ebuild |
5 |
Added: tomcat-servlet-api-4.1.36.ebuild |
6 |
tomcat-servlet-api-3.ebuild |
7 |
Removed: tomcat-servlet-api-5.5.23.ebuild |
8 |
Log: |
9 |
Removed past unused 5.5.x version. Added (migrated servletapi) ebuilds for 2.2 and 2.3 slots using upstream sources vs ours. Quoted vars in existing. |
10 |
(Portage version: 2.1.3.16) |
11 |
|
12 |
Revision Changes Path |
13 |
1.35 dev-java/tomcat-servlet-api/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog?rev=1.35&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog?rev=1.35&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog?r1=1.34&r2=1.35 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v |
22 |
retrieving revision 1.34 |
23 |
retrieving revision 1.35 |
24 |
diff -u -r1.34 -r1.35 |
25 |
--- ChangeLog 27 Oct 2007 09:01:22 -0000 1.34 |
26 |
+++ ChangeLog 3 Nov 2007 02:01:25 -0000 1.35 |
27 |
@@ -1,6 +1,16 @@ |
28 |
# ChangeLog for dev-java/tomcat-servlet-api |
29 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.34 2007/10/27 09:01:22 nelchael Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.35 2007/11/03 02:01:25 wltjr Exp $ |
32 |
+ |
33 |
+*tomcat-servlet-api-4.1.36 (03 Nov 2007) |
34 |
+*tomcat-servlet-api-3 (03 Nov 2007) |
35 |
+ |
36 |
+ 03 Nov 2007; William L. Thomson Jr. <wltjr@g.o> |
37 |
+ +tomcat-servlet-api-3.ebuild, +tomcat-servlet-api-4.1.36.ebuild, |
38 |
+ -tomcat-servlet-api-5.5.23.ebuild, tomcat-servlet-api-5.5.25.ebuild, |
39 |
+ tomcat-servlet-api-6.0.14.ebuild: |
40 |
+ Removed past unused 5.5.x version. Added (migrated servletapi) ebuilds for |
41 |
+ 2.2 and 2.3 slots using upstream sources vs ours. Quoted vars in existing. |
42 |
|
43 |
27 Oct 2007; Krzysiek Pawlik <nelchael@g.o> |
44 |
tomcat-servlet-api-5.5.25.ebuild: |
45 |
|
46 |
|
47 |
|
48 |
1.3 dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild?rev=1.3&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild?rev=1.3&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild?r1=1.2&r2=1.3 |
53 |
|
54 |
Index: tomcat-servlet-api-5.5.25.ebuild |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild,v |
57 |
retrieving revision 1.2 |
58 |
retrieving revision 1.3 |
59 |
diff -u -r1.2 -r1.3 |
60 |
--- tomcat-servlet-api-5.5.25.ebuild 27 Oct 2007 09:01:22 -0000 1.2 |
61 |
+++ tomcat-servlet-api-5.5.25.ebuild 3 Nov 2007 02:01:25 -0000 1.3 |
62 |
@@ -1,6 +1,6 @@ |
63 |
# Copyright 1999-2007 Gentoo Foundation |
64 |
# Distributed under the terms of the GNU General Public License v2 |
65 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild,v 1.2 2007/10/27 09:01:22 nelchael Exp $ |
66 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild,v 1.3 2007/11/03 02:01:25 wltjr Exp $ |
67 |
|
68 |
inherit eutils java-pkg-2 java-ant-2 |
69 |
|
70 |
@@ -29,20 +29,20 @@ |
71 |
} |
72 |
|
73 |
src_install() { |
74 |
- mv jsr{154,152}/dist/lib/*.jar ${S} |
75 |
+ mv jsr{154,152}/dist/lib/*.jar "${S}" |
76 |
|
77 |
if use doc ; then |
78 |
mkdir docs |
79 |
- cd ${S}/jsr154/build |
80 |
- mv docs ${S}/docs/servlet |
81 |
- mv examples ${S}/docs/servlet/examples |
82 |
- |
83 |
- cd ${S}/jsr152/build |
84 |
- mv docs ${S}/docs/jsp |
85 |
- mv examples ${S}/docs/jsp/examples |
86 |
+ cd "${S}/jsr154/build" |
87 |
+ mv docs "${S}/docs/servlet" |
88 |
+ mv examples "${S}/docs/servlet/examples" |
89 |
+ |
90 |
+ cd "${S}/jsr152/build" |
91 |
+ mv docs "${S}/docs/jsp" |
92 |
+ mv examples "${S}/docs/jsp/examples" |
93 |
fi |
94 |
|
95 |
- cd ${S} |
96 |
+ cd "${S}" |
97 |
java-pkg_dojar *.jar |
98 |
use doc && java-pkg_dohtml -r docs/* |
99 |
use source && java-pkg_dosrc jsr{152,154}/src/share/javax |
100 |
|
101 |
|
102 |
|
103 |
1.6 dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild |
104 |
|
105 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild?rev=1.6&view=markup |
106 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild?rev=1.6&content-type=text/plain |
107 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild?r1=1.5&r2=1.6 |
108 |
|
109 |
Index: tomcat-servlet-api-6.0.14.ebuild |
110 |
=================================================================== |
111 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild,v |
112 |
retrieving revision 1.5 |
113 |
retrieving revision 1.6 |
114 |
diff -u -r1.5 -r1.6 |
115 |
--- tomcat-servlet-api-6.0.14.ebuild 2 Sep 2007 15:05:55 -0000 1.5 |
116 |
+++ tomcat-servlet-api-6.0.14.ebuild 3 Nov 2007 02:01:25 -0000 1.6 |
117 |
@@ -1,6 +1,6 @@ |
118 |
# Copyright 1999-2007 Gentoo Foundation |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild,v 1.5 2007/09/02 15:05:55 corsair Exp $ |
121 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild,v 1.6 2007/11/03 02:01:25 wltjr Exp $ |
122 |
|
123 |
JAVA_PKG_IUSE="source" |
124 |
|
125 |
@@ -25,7 +25,7 @@ |
126 |
unpack ${A} |
127 |
cd "${S}" |
128 |
|
129 |
- cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml" |
130 |
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" |
131 |
rm */*/build.xml |
132 |
} |
133 |
|
134 |
|
135 |
|
136 |
|
137 |
1.1 dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild |
138 |
|
139 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild?rev=1.1&view=markup |
140 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild?rev=1.1&content-type=text/plain |
141 |
|
142 |
Index: tomcat-servlet-api-4.1.36.ebuild |
143 |
=================================================================== |
144 |
# Copyright 1999-2007 Gentoo Foundation |
145 |
# Distributed under the terms of the GNU General Public License v2 |
146 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild,v 1.1 2007/11/03 02:01:25 wltjr Exp $ |
147 |
|
148 |
JAVA_PKG_IUSE="doc source" |
149 |
|
150 |
inherit java-pkg-2 java-ant-2 |
151 |
|
152 |
MY_P="apache-${P/-servlet-api/}-src" |
153 |
DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation" |
154 |
HOMEPAGE="http://tomcat.apache.org/" |
155 |
SRC_URI="mirror://apache/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz" |
156 |
DEPEND=">=virtual/jdk-1.4" |
157 |
RDEPEND=">=virtual/jre-1.4" |
158 |
LICENSE="Apache-1.1" |
159 |
SLOT="2.3" |
160 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
161 |
IUSE="" |
162 |
S="${WORKDIR}/${MY_P}/servletapi" |
163 |
|
164 |
src_unpack() { |
165 |
unpack ${A} |
166 |
cd "${S}" |
167 |
|
168 |
einfo "Removing bundled jars and classes" |
169 |
find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete |
170 |
} |
171 |
|
172 |
EANT_BUILD_TARGET="all" |
173 |
|
174 |
src_install() { |
175 |
java-pkg_dojar dist/lib/servlet.jar |
176 |
|
177 |
use doc && java-pkg_dohtml -r dist/docs/* |
178 |
use source && java-pkg_dosrc src/share/javax |
179 |
dodoc dist/README.txt |
180 |
} |
181 |
|
182 |
|
183 |
|
184 |
1.1 dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild |
185 |
|
186 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild?rev=1.1&view=markup |
187 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild?rev=1.1&content-type=text/plain |
188 |
|
189 |
Index: tomcat-servlet-api-3.ebuild |
190 |
=================================================================== |
191 |
# Copyright 1999-2007 Gentoo Foundation |
192 |
# Distributed under the terms of the GNU General Public License v2 |
193 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild,v 1.1 2007/11/03 02:01:25 wltjr Exp $ |
194 |
|
195 |
JAVA_PKG_IUSE="doc source" |
196 |
|
197 |
inherit java-pkg-2 java-ant-2 |
198 |
|
199 |
MY_PN="${PN/tomcat/}" |
200 |
MY_PN="jakarta-${MY_PN//-/}-src" |
201 |
DESCRIPTION="Tomcat's Servlet API 2.2/JSP API 1.2 implementation" |
202 |
HOMEPAGE="http://tomcat.apache.org/" |
203 |
SRC_URI="http://archive.apache.org/dist/jakarta/tomcat-3/src/${MY_PN}.tar.gz" |
204 |
DEPEND=">=virtual/jdk-1.4" |
205 |
RDEPEND=">=virtual/jre-1.4" |
206 |
LICENSE="Apache-1.1" |
207 |
SLOT="2.2" |
208 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
209 |
IUSE="" |
210 |
S="${WORKDIR}/${MY_PN}" |
211 |
|
212 |
EANT_BUILD_TARGET="all" |
213 |
|
214 |
src_install() { |
215 |
java-pkg_dojar ../dist/servletapi/lib/servlet.jar |
216 |
|
217 |
use doc && java-pkg_dohtml -r ../dist/servletapi/docs/* |
218 |
use source && java-pkg_dosrc src/share/javax |
219 |
dodoc ../dist/README.txt |
220 |
} |
221 |
|
222 |
|
223 |
|
224 |
-- |
225 |
gentoo-commits@g.o mailing list |