Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
Date: Mon, 08 Feb 2021 11:05:33
Message-Id: 1612782252.6e60542e3199cf3c0f2702886300fa3446fe094b.fordfrog@gentoo
1 commit: 6e60542e3199cf3c0f2702886300fa3446fe094b
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 8 11:04:12 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 8 11:04:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e60542e
7
8 dev-java/tomcat-servlet-api: bump to 7.0.108
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-7.0.108.ebuild | 98 ++++++++++++++++++++++
15 2 files changed, 99 insertions(+)
16
17 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
18 index 6a1965fc22f..40684a7f459 100644
19 --- a/dev-java/tomcat-servlet-api/Manifest
20 +++ b/dev-java/tomcat-servlet-api/Manifest
21 @@ -3,6 +3,7 @@ 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-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
26 DIST apache-tomcat-8.5.61-src.tar.gz 5840559 BLAKE2B 18e1505b6b7d8e1a024d9f834d33ef105a16e6fc1f9e80abd3e6e88b2326597b9973e13c2ebc030a1db4a2d4dc5572d195b9f61db6cb7bf51e97cbfaa121678a SHA512 fd6bb5926b5e7cf44f359c93dadc4edd87fa5f2e26fb0fb3a9bc0a5c89ae4d844d66872055e1b441392cf03d7690aca3429b66afd8334319784f089f821d8c22
27 DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
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-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
31 new file mode 100644
32 index 00000000000..52e6931e9e2
33 --- /dev/null
34 +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
35 @@ -0,0 +1,98 @@
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 eutils 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 +}