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