| 1 |
commit: 1c5a1605ac553c413752a8c2fa0f240ee84ef2a2 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 1 11:48:09 2022 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 1 11:48:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5a1605 |
| 7 |
|
| 8 |
dev-java/tomcat-servlet-api: bump to 8.5.78 |
| 9 |
|
| 10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
| 13 |
.../tomcat-servlet-api-8.5.78.ebuild | 99 ++++++++++++++++++++++ |
| 14 |
2 files changed, 100 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
| 17 |
index 8a9ee271439a..1ed42be88206 100644 |
| 18 |
--- a/dev-java/tomcat-servlet-api/Manifest |
| 19 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
| 20 |
@@ -9,6 +9,7 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88 |
| 21 |
DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a SHA512 c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad |
| 22 |
DIST apache-tomcat-8.5.76-src.tar.gz 5961741 BLAKE2B 4c661c2f753edac48c28fdec3caa06c487e1546feb91f2d69003a4d9f71fb023eb2314520bb156f3087656d655acdfdbdff3f68cd3f81d0d9dfbb2c9577898ee SHA512 b1c1b8c870c77e46969fe64acc71194d37605e5ccda87d105186d8070ec2dd0b7b9c64cf2f9b276db140fd3927832405123018f6fe8f46c0ebda50af6404d8b9 |
| 23 |
DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157 |
| 24 |
+DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32 |
| 25 |
DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9 SHA512 b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a |
| 26 |
DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3 SHA512 cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80 |
| 27 |
DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 |
| 28 |
|
| 29 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild |
| 30 |
new file mode 100644 |
| 31 |
index 000000000000..c6359840b613 |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.78.ebuild |
| 34 |
@@ -0,0 +1,99 @@ |
| 35 |
+# Copyright 1999-2022 Gentoo Authors |
| 36 |
+# Distributed under the terms of the GNU General Public License v2 |
| 37 |
+ |
| 38 |
+EAPI=7 |
| 39 |
+ |
| 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.1/JSP API 2.3/EL API 3.0 implementation" |
| 47 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 48 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
| 49 |
+ |
| 50 |
+LICENSE="Apache-2.0" |
| 51 |
+SLOT="3.1" |
| 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 |
+} |
Archives