[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/

[Miroslav Šulc]

commit:     3dc1430f392e3588eaa28be59d1bc7537af55838
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  5 17:50:45 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  5 17:50:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc1430f

dev-java/tomcat-servlet-api: bump to 9.0.54

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/tomcat-servlet-api/Manifest               |  1 +
 .../tomcat-servlet-api-9.0.54.ebuild               | 99 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-java/tomcat-servlet-api/Manifest 
b/dev-java/tomcat-servlet-api/Manifest
index caf5811431b..d3f9c121d65 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -9,3 +9,4 @@ DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 
9a2bf14c9b9f551af15ebf2b95f
 DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B 
b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef
 SHA512 
df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba
 DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 
8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27
 SHA512 
8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d
 DIST apache-tomcat-9.0.53-src.tar.gz 6142608 BLAKE2B 
71f45e04ac01221cbfc6e730066e1aa7f5d65d31a497a775a3147180591f23799f0b47db3a1dd4a86936c40f624795cf4fd1d3dd44d4d39633aeb0733f4f9f26
 SHA512 
f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27
+DIST apache-tomcat-9.0.54-src.tar.gz 6132613 BLAKE2B 
5d37359ac9cac2a1387675a095aa0bea3e2bc74740d761a13fb2313aaca8ddb14f10922a8edc0932c9139c04b4df7f5735b067a71ac75ebbfe16ff6066311993
 SHA512 
e9d532a966aa8e7c2fcf28e4ecb0a618a8be4dacf8dc579a407483de86ef969383e3662fba07be629bfb8fbd85c041a5a2f1dd8875cc309b69a147b37c58974b

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild 
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
new file mode 100644
index 00000000000..4a8d22d1286
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.54.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/";
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris 
~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}/"
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+       default
+
+       # The sources and also resources are mixed together so we first give it 
a structure to make it easier to compila and package
+
+       mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+               ${EL_API_SRC} ${EL_API_RESOURCES} \
+               ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \
+               ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+       pushd java || die "Failed to cd to java dir"
+
+       cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed 
to copy servlet-api sources"
+       mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" 
"${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources"
+       cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy 
el-api sources"
+
+       popd
+
+       for file in $(find src -type f | grep -vE "\.java$"); do
+               target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+               mkdir -p ${target_dir} || die "Failed to create resource 
directory"
+               mv $file ${target_dir} || die "Failed to move resource file"
+       done
+
+       mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+       java-pkg-2_src_prepare
+}
+
+src_compile() {
+       JAVA_SRC_DIR="${SERVLET_API_SRC}"
+       JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+       JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+       java-pkg-simple_src_compile
+       rm -fr target || die "Failed to remove compiled files"
+
+       JAVA_SRC_DIR="${EL_API_SRC}"
+       JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+       JAVA_JAR_FILENAME="${EL_API_JAR}"
+       java-pkg-simple_src_compile
+       rm -fr target || die "Failed to remove compiled files"
+
+       JAVA_SRC_DIR="${JSP_API_SRC}"
+       JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+       JAVA_JAR_FILENAME="${JSP_API_JAR}"
+       JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+       java-pkg-simple_src_compile
+}
+
+src_install() {
+       JAVA_SRC_DIR="${SERVLET_API_SRC}"
+       JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+       java-pkg-simple_src_install
+
+       JAVA_SRC_DIR="${EL_API_SRC}"
+       JAVA_JAR_FILENAME="${EL_API_JAR}"
+       java-pkg-simple_src_install
+
+       JAVA_SRC_DIR="${JSP_API_SRC}"
+       JAVA_JAR_FILENAME="${JSP_API_JAR}"
+       java-pkg-simple_src_install
+}