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

[Miroslav Šulc]

commit:     0654e54a15a1d954f0f69b49992e7ea4300d7ecf
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 11:21:14 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 13 11:21:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0654e54a

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

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

diff --git a/dev-java/tomcat-servlet-api/Manifest 
b/dev-java/tomcat-servlet-api/Manifest
index 5a5a51e4d91..af7bc40ab1a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -7,3 +7,4 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 
56583caea6879bf8ca5cc02a88
 DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 
8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187
 SHA512 
df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
 DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B 
bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d
 SHA512 
322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b
 DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 
66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682
 SHA512 
e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
+DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 
400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c
 SHA512 
dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild 
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.ebuild
new file mode 100644
index 00000000000..4a8d22d1286
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.46.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
+}