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 6FBAD158021 for ; Sat, 17 Dec 2022 09:48:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52F04E086D; Sat, 17 Dec 2022 09:47:59 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 349B9E086D for ; Sat, 17 Dec 2022 09:47:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2245034113D for ; Sat, 17 Dec 2022 09:47:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DCA27CC for ; Sat, 17 Dec 2022 09:47:56 +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: <1671270331.417ca4012aaf98155cb0ceca3d79d4c2b2c93792.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-el-api/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-el-api/Manifest dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild X-VCS-Directories: dev-java/tomcat-el-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 417ca4012aaf98155cb0ceca3d79d4c2b2c93792 X-VCS-Branch: master Date: Sat, 17 Dec 2022 09:47:56 +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: 72ee2a76-b008-4702-9aeb-4b0072818629 X-Archives-Hash: c295d13edbae814e3fdcc1fe98bab9cd commit: 417ca4012aaf98155cb0ceca3d79d4c2b2c93792 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Dec 17 09:45:31 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Dec 17 09:45:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417ca401 dev-java/tomcat-el-api: dropped obsolete 10.1.1 & 9.0.68-r1 Bug: https://bugs.gentoo.org/886283 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-el-api/Manifest | 2 -- dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild | 36 ---------------------- .../tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild | 36 ---------------------- 3 files changed, 74 deletions(-) diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest index 88f5be342cdb..2fd6208849f5 100644 --- a/dev-java/tomcat-el-api/Manifest +++ b/dev-java/tomcat-el-api/Manifest @@ -1,5 +1,4 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15 -DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2 @@ -7,7 +6,6 @@ DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2 -DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1 DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild deleted file mode 100644 index f6571a0cfc3f..000000000000 --- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 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-el-api:10.1.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Tomcat's EL API 5.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="5.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -DEPEND=">=virtual/jdk-11:*" -RDEPEND=">=virtual/jre-11:*" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/jakarta/el" - -src_prepare() { - default - # remove anything related to "el" or "jsp" - find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \ - -exec rm -rf {} + || die "removing jsp failed" - - mkdir resources || "creating \"resources\" failed" - cp -r java/jakarta resources || "cannot copy to \"resources\" dir" - find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed" -} diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild deleted file mode 100644 index c62e311cee21..000000000000 --- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 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-el-api:9.0.68" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Tomcat's EL API 5.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="3.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/javax/el" - -src_prepare() { - default - # remove anything related to "el" or "jsp" - find java/javax \( -name 'jsp' -o -name 'servlet' \) \ - -exec rm -rf {} + || die "removing jsp failed" - - mkdir resources || "creating \"resources\" failed" - cp -r java/javax resources || "cannot copy to \"resources\" dir" - find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed" -}