From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 947C2158094 for ; Tue, 26 Jul 2022 17:52:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2387E0E8C; Tue, 26 Jul 2022 17:52:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5986E0E8C for ; Tue, 26 Jul 2022 17:52:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 930A4340FAD for ; Tue, 26 Jul 2022 17:52:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3AEC448 for ; Tue, 26 Jul 2022 17:52:25 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1658857915.d1aece6a2d767e933aa6ef421c5e3802df20782a.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-servlet-api/Manifest dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild X-VCS-Directories: dev-java/tomcat-servlet-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d1aece6a2d767e933aa6ef421c5e3802df20782a X-VCS-Branch: master Date: Tue, 26 Jul 2022 17:52:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa929e50-379b-42ad-92e3-8b4e242c918e X-Archives-Hash: 67c7b08e8f80867912423aa1b9ceb8b1 commit: d1aece6a2d767e933aa6ef421c5e3802df20782a Author: Miroslav Šulc gentoo org> AuthorDate: Tue Jul 26 17:51:55 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Jul 26 17:51:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1aece6a dev-java/tomcat-servlet-api: bump to 10.0.23 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 1 + .../tomcat-servlet-api-10.0.23.ebuild | 98 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index b9293c943e1b..073c039d79ca 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,4 +1,5 @@ DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85ffa4f132c3cf30db24a331ef2d279e4c618aa817981a963c54148cbcd01af0d502ecf2c4c0f4debdb301f202ea748ea2572a66 SHA512 2d26828a1c44876feb4746186090866784f2a136d8120eb3dc106af7cc4cb95e94c6cbb51a3d4a14ea7159cd3351f4bd475153864e43d7e192296b5382c93a83 +DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360 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 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild new file mode 100644 index 000000000000..acb0d6c5fcea --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild @@ -0,0 +1,98 @@ +# 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 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 ~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 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 +}