commit: d608a1cef41b0e55053383ce7e0baef38c782ce0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 16:07:08 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 16:07:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d608a1ce
dev-java/tomcat-servlet-api: bump to 8.5.82
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/tomcat-servlet-api/Manifest | 1 +
.../tomcat-servlet-api-8.5.82.ebuild | 99 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/Manifest
b/dev-java/tomcat-servlet-api/Manifest
index 073c039d79ca..fb8a631be0a0 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,5 +5,6 @@ DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B
dbfcfd123a23b0ceb9f1fdd936e
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B
054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40
SHA512
915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B
56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703
SHA512
ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B
569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49
SHA512
a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581
+DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B
ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce
SHA512
3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2
DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B
3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4
SHA512
7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386
DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B
13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7
SHA512
3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild
new file mode 100644
index 000000000000..c6359840b613
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.82.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 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-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/";
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+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
+}
