1 |
commit: 9f6756cc9719696101d52d530a2148a96817d863 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 1 06:57:22 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 1 06:57:30 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6756cc |
7 |
|
8 |
dev-java/tomcat-servlet-api: removed obsolete 7.0.108 |
9 |
|
10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
dev-java/tomcat-servlet-api/Manifest | 1 - |
14 |
.../tomcat-servlet-api-7.0.108.ebuild | 98 ---------------------- |
15 |
2 files changed, 99 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
18 |
index 0383b2e6a33..9f74ceb0aed 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -3,7 +3,6 @@ DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e |
22 |
DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e |
23 |
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 |
24 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
25 |
-DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2 |
26 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
27 |
DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa |
28 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
29 |
|
30 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild |
31 |
deleted file mode 100644 |
32 |
index 0a4f99352d9..00000000000 |
33 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,98 +0,0 @@ |
36 |
-# Copyright 1999-2021 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
-JAVA_PKG_IUSE="source" |
41 |
- |
42 |
-inherit java-pkg-2 java-pkg-simple |
43 |
- |
44 |
-MY_A="apache-${P}-src" |
45 |
-MY_P="${MY_A/-servlet-api/}" |
46 |
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" |
47 |
-HOMEPAGE="https://tomcat.apache.org/" |
48 |
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" |
49 |
- |
50 |
-LICENSE="Apache-2.0" |
51 |
-SLOT="3.0" |
52 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
53 |
-IUSE="" |
54 |
- |
55 |
-DEPEND=">=virtual/jdk-1.8" |
56 |
-RDEPEND=">=virtual/jre-1.8" |
57 |
- |
58 |
-S="${WORKDIR}/${MY_P}/" |
59 |
- |
60 |
-JAVA_TEST_SRC_DIR="src/test" |
61 |
- |
62 |
-SERVLET_API_JAR="servlet-api.jar" |
63 |
-SERVLET_API_SRC="src/main/servlet-api" |
64 |
-SERVLET_API_RESOURCES="src/resources/servlet-api" |
65 |
-EL_API_JAR="el-api.jar" |
66 |
-EL_API_SRC="src/main/el-api" |
67 |
-EL_API_RESOURCES="src/resources/el-api" |
68 |
-JSP_API_JAR="jsp-api.jar" |
69 |
-JSP_API_SRC="src/main/jsp-api" |
70 |
-JSP_API_RESOURCES="src/resources/jsp-api" |
71 |
- |
72 |
-src_prepare() { |
73 |
- default |
74 |
- |
75 |
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
76 |
- |
77 |
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
78 |
- ${EL_API_SRC} ${EL_API_RESOURCES} \ |
79 |
- ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
80 |
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
81 |
- |
82 |
- pushd java || die "Failed to cd to java dir" |
83 |
- |
84 |
- cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
85 |
- mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
86 |
- cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
87 |
- |
88 |
- popd |
89 |
- |
90 |
- for file in $(find src -type f | grep -vE "\.java$"); do |
91 |
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
92 |
- mkdir -p ${target_dir} || die "Failed to create resource directory" |
93 |
- mv $file ${target_dir} || die "Failed to move resource file" |
94 |
- done |
95 |
- |
96 |
- mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
97 |
- |
98 |
- java-pkg-2_src_prepare |
99 |
-} |
100 |
- |
101 |
-src_compile() { |
102 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
103 |
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
104 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
105 |
- java-pkg-simple_src_compile |
106 |
- rm -fr target || die "Failed to remove compiled files" |
107 |
- |
108 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
109 |
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
110 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
111 |
- java-pkg-simple_src_compile |
112 |
- rm -fr target || die "Failed to remove compiled files" |
113 |
- |
114 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
115 |
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
116 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
117 |
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
118 |
- java-pkg-simple_src_compile |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
123 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
124 |
- java-pkg-simple_src_install |
125 |
- |
126 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
127 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
128 |
- java-pkg-simple_src_install |
129 |
- |
130 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
131 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
132 |
- java-pkg-simple_src_install |
133 |
-} |