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

[Miroslav Šulc]

commit:     ec0aa8cab0ebc7af85e22ae7f57d7c716e457a7c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 21:08:18 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 21:08:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0aa8ca

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

Package-Manager: Portage-3.0.30, 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.59.ebuild               | 99 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-java/tomcat-servlet-api/Manifest 
b/dev-java/tomcat-servlet-api/Manifest
index 03443ae01138..aa075371df87 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -6,3 +6,4 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 
054b097c16861abaa8bdbeba713
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 
56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703
 SHA512 
ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.75-src.tar.gz 5961981 BLAKE2B 
a8d3c0ef390ce6b12b09cedb71cd9c102e3a37265f7ef6db9797eb7eaf04429f75bdedf6a7dbaa7ade0b57a12cbb461498c37d9c7e234bb9dc98e3d095b66b8a
 SHA512 
c1c2609db623eb94a5e177c0f7ccabf8753a34151961ddc0fdea47704aca86123ef63f746b7ca76e818185cae19121823f7700f9bd47ba27625b3c801ddc8bad
 DIST apache-tomcat-9.0.58-src.tar.gz 6142037 BLAKE2B 
0515273882468958f5bc2ef95e3085c22975e0ec9f8153a20773266a43710645c2262da8cb10736f0f0b255716fa05a12252194e1f32851704364ef89a62e5e9
 SHA512 
b2b572dcad2efadf3e5e5a6ae6e108f5699af23b7751ca3c9c00e6ba896f5179745108fa602d8bd87a9611fd8bebe8817fad53c38fc75b0063835b953c67d74a
+DIST apache-tomcat-9.0.59-src.tar.gz 6142359 BLAKE2B 
26dee501a374e54280237dbe392924ac89e3e4b331a11b30c2e0923ac38fa16bb52c02dfc8a9f3597fb0ee169ae2835ac254eab745d1e2ab1e64cfed6395d0c3
 SHA512 
cea0125ca9b90b247ed114fa7b2e9c63da38b1ef97b3a373a43ed0d775764178534a4014b254219c8c5a26575eaf0ddc25ebc1e276b2ad5086ef3406627f1c80

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild 
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
new file mode 100644
index 000000000000..09fffd263372
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.59.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+}