1 |
commit: c35f13ae88a5ca3cfd40f3bf8c8d5e71608e6d34 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 1 09:10:01 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 1 09:10:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35f13ae |
7 |
|
8 |
dev-java/tomcat-servlet-api: removed obsolete 9.0.40 |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
dev-java/tomcat-servlet-api/Manifest | 1 - |
14 |
.../tomcat-servlet-api-9.0.40.ebuild | 104 --------------------- |
15 |
2 files changed, 105 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
18 |
index 9ecb2fb1b54..e2381f9bb42 100644 |
19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
21 |
@@ -3,5 +3,4 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e |
22 |
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c |
23 |
DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b |
24 |
DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22 |
25 |
-DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb |
26 |
DIST apache-tomcat-9.0.41-src.tar.gz 6022059 BLAKE2B 6e97390aec956c16f271e57a2fa8805b6f49f593434f0dff8d82e14bc9abc199b00a7523dbb8da335a7ffa9dfee6790430c30f8b0ee90bcd133694c8da42197f SHA512 094e7cbd2519a4b812a2ca865f92802ece3385a20826c5e29b5f7cda8b9265d01ede6f598999f8aa2f1b04bcaca2e67e3f0132781b3f22007356df49ab6b1838 |
27 |
|
28 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild |
29 |
deleted file mode 100644 |
30 |
index 1b6455796d4..00000000000 |
31 |
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.40.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,104 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-JAVA_PKG_IUSE="source" |
40 |
- |
41 |
-inherit eutils java-pkg-2 java-pkg-simple |
42 |
- |
43 |
-MY_A="apache-${PN}-${PV}-src" |
44 |
-MY_P="${MY_A/-servlet-api/}" |
45 |
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" |
46 |
-HOMEPAGE="https://tomcat.apache.org/" |
47 |
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
48 |
- |
49 |
-LICENSE="Apache-2.0" |
50 |
-SLOT="4.0" |
51 |
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
52 |
-IUSE="" |
53 |
- |
54 |
-DEPEND=">=virtual/jdk-1.8" |
55 |
-RDEPEND=">=virtual/jre-1.8" |
56 |
- |
57 |
-S="${WORKDIR}/${MY_P}/" |
58 |
- |
59 |
-# we don't have the aQute.bnd.annotation.spi packaged |
60 |
-PATCHES=( |
61 |
- "${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch" |
62 |
-) |
63 |
- |
64 |
-JAVA_TEST_SRC_DIR="src/test" |
65 |
- |
66 |
-SERVLET_API_JAR="servlet-api.jar" |
67 |
-SERVLET_API_SRC="src/main/servlet-api" |
68 |
-SERVLET_API_RESOURCES="src/resources/servlet-api" |
69 |
-EL_API_JAR="el-api.jar" |
70 |
-EL_API_SRC="src/main/el-api" |
71 |
-EL_API_RESOURCES="src/resources/el-api" |
72 |
-JSP_API_JAR="jsp-api.jar" |
73 |
-JSP_API_SRC="src/main/jsp-api" |
74 |
-JSP_API_RESOURCES="src/resources/jsp-api" |
75 |
- |
76 |
-src_prepare() { |
77 |
- default |
78 |
- |
79 |
- # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
80 |
- |
81 |
- mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
82 |
- ${EL_API_SRC} ${EL_API_RESOURCES} \ |
83 |
- ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
84 |
- ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
85 |
- |
86 |
- pushd java || die "Failed to cd to java dir" |
87 |
- |
88 |
- cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
89 |
- mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
90 |
- cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
91 |
- |
92 |
- popd |
93 |
- |
94 |
- for file in $(find src -type f | grep -vE "\.java$"); do |
95 |
- target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
96 |
- mkdir -p ${target_dir} || die "Failed to create resource directory" |
97 |
- mv $file ${target_dir} || die "Failed to move resource file" |
98 |
- done |
99 |
- |
100 |
- mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
101 |
- |
102 |
- java-pkg-2_src_prepare |
103 |
-} |
104 |
- |
105 |
-src_compile() { |
106 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
107 |
- JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
108 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
109 |
- java-pkg-simple_src_compile |
110 |
- rm -fr target || die "Failed to remove compiled files" |
111 |
- |
112 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
113 |
- JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
114 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
115 |
- java-pkg-simple_src_compile |
116 |
- rm -fr target || die "Failed to remove compiled files" |
117 |
- |
118 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
119 |
- JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
120 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
121 |
- JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
122 |
- java-pkg-simple_src_compile |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- JAVA_SRC_DIR="${SERVLET_API_SRC}" |
127 |
- JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
128 |
- java-pkg-simple_src_install |
129 |
- |
130 |
- JAVA_SRC_DIR="${EL_API_SRC}" |
131 |
- JAVA_JAR_FILENAME="${EL_API_JAR}" |
132 |
- java-pkg-simple_src_install |
133 |
- |
134 |
- JAVA_SRC_DIR="${JSP_API_SRC}" |
135 |
- JAVA_JAR_FILENAME="${JSP_API_JAR}" |
136 |
- java-pkg-simple_src_install |
137 |
-} |