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

[Miroslav Šulc]

commit:     e05a757c231603fe012816ec4179ccfb9ab854d4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  9 08:31:05 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 08:32:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e05a757c

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

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

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

diff --git a/dev-java/tomcat-servlet-api/Manifest 
b/dev-java/tomcat-servlet-api/Manifest
index 029209946a3..a1328a6ceae 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,4 @@
+DIST apache-tomcat-10.0.10-src.tar.gz 6032784 BLAKE2B 
f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70
 SHA512 
6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658
 DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 
86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948
 SHA512 
c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B 
f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b
 SHA512 
c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B 
dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3
 SHA512 
845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild 
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
new file mode 100644
index 00000000000..fb739b89bf7
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild
@@ -0,0 +1,98 @@
+# 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 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/";
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 compile and package
+       mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+               ${EL_API_SRC} ${EL_API_RESOURCES} \
+               ${JSP_API_SRC}/jakarta/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 jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die 
"Failed to copy servlet-api sources"
+       mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" 
"${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+       cp --parents -R jakarta/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/jakarta ${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
+}