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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38E4D15A7DA for ; Thu, 23 Mar 2023 05:48:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8F1BE0825; Thu, 23 Mar 2023 05:48:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7E763E07EE for ; Thu, 23 Mar 2023 05:48:29 +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 8AD263408A2 for ; Thu, 23 Mar 2023 05:48:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC7658DA for ; Thu, 23 Mar 2023 05:48:26 +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: <1679550329.3c852d1b62ba7873d5ce9b59018483212a8d7656.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jsp-api/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-jsp-api/Manifest dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild X-VCS-Directories: dev-java/tomcat-jsp-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 3c852d1b62ba7873d5ce9b59018483212a8d7656 X-VCS-Branch: master Date: Thu, 23 Mar 2023 05:48:26 +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: 662c5411-30bf-4b16-bf12-07c7331884fd X-Archives-Hash: 94c6a59b1408f855cb3010f9dbd11ea7 commit: 3c852d1b62ba7873d5ce9b59018483212a8d7656 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Mar 23 00:20:50 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Mar 23 05:45:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c852d1b dev-java/tomcat-jsp-api: drop 8.5.85, 9.0.71 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-jsp-api/Manifest | 4 -- .../tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild | 47 ---------------------- .../tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild | 47 ---------------------- 3 files changed, 98 deletions(-) diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest index 5ac0d1b46300..3beda5a1990f 100644 --- a/dev-java/tomcat-jsp-api/Manifest +++ b/dev-java/tomcat-jsp-api/Manifest @@ -1,6 +1,2 @@ DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02 DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712 -DIST apache-tomcat-8.5.85-src.tar.gz 6035271 BLAKE2B 06180fe34c3bd70678dd82d44e2cfc7cf4ed367523b35f3cdaab6c15a5a586522584c8338a990543b5452073ae3ed8a60fad9a159ddfd63adcbaaac35a5a4528 SHA512 1500c87a4f3f5302ff28f7592c1bdd66190095b04a1fac349bf421d117c0ace7b109bfb7943795375bcdf76c810df8f588150ccfb5843ccdf10c394b11754736 -DIST apache-tomcat-8.5.85-src.tar.gz.asc 849 BLAKE2B ead4de7a2fe01f67b2c3fd61d4c85d87e5142f2bd0ba933d70d8e5a8935e6bd97fff14bd4d4ddeee27edd7683971d241e6d14126fee01e789914a394ee0faf47 SHA512 e7c3cb19cff697154d159986748680d66bae22a12bc272a09d64b39ed681d60ce9d7ff9ba9c2f45744b6ac81b675a87af6c7df3eecd7079b98749063fbe579a5 -DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930 -DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80 diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild deleted file mode 100644 index a9212356cc4d..000000000000 --- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.85.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:8.5.85" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Tomcat's JSP API 2.3 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="2.3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -CP_DEPEND=" - ~dev-java/tomcat-el-api-${PV}:3.0 - ~dev-java/tomcat-servlet-api-${PV}:3.1 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/javax/servlet/jsp" - -src_prepare() { - default - mkdir -p resources/javax/servlet || "creating \"resources\" failed" - cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir" - find resources \( -name '*.java' -o -name 'tagext' \) \ - -exec rm -rf {} + || die "removing *.java files failed" -} diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild deleted file mode 100644 index f8ae3bc3aa43..000000000000 --- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:9.0.71" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Tomcat's JSP API 2.3 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="2.3" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -CP_DEPEND=" - ~dev-java/tomcat-el-api-${PV}:3.0 - ~dev-java/tomcat-servlet-api-${PV}:4.0 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND}" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/javax/servlet/jsp" - -src_prepare() { - default - mkdir -p resources/javax/servlet || "creating \"resources\" failed" - cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir" - find resources \( -name '*.java' -o -name 'tagext' \) \ - -exec rm -rf {} + || die "removing *.java files failed" -}