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 1C468158091 for ; Wed, 1 Jun 2022 05:51:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F729E088C; Wed, 1 Jun 2022 05:51:33 +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 29093E088C for ; Wed, 1 Jun 2022 05:51:33 +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 CD7873416CA for ; Wed, 1 Jun 2022 05:51:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B8254C3 for ; Wed, 1 Jun 2022 05:51:30 +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: <1654062681.71d70747cb64a68f2b346d3bfe61e776c3cc499b.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.18.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild X-VCS-Directories: dev-java/tomcat-servlet-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 71d70747cb64a68f2b346d3bfe61e776c3cc499b X-VCS-Branch: master Date: Wed, 1 Jun 2022 05:51:30 +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: 4a119d1c-0400-4648-ba2b-668dc4b18e11 X-Archives-Hash: dc0e34dac087f254c66df4d6c732e52a commit: 71d70747cb64a68f2b346d3bfe61e776c3cc499b Author: Miroslav Šulc gentoo org> AuthorDate: Wed Jun 1 05:51:21 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jun 1 05:51:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d70747 dev-java/tomcat-servlet-api: dropped obsolete 9.0.60 & 10.0.18 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 2 - .../tomcat-servlet-api-10.0.18.ebuild | 98 --------------------- .../tomcat-servlet-api-9.0.60.ebuild | 99 ---------------------- 3 files changed, 199 deletions(-) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 4ed21f0d343f..d5fbce26304a 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,4 +1,3 @@ -DIST apache-tomcat-10.0.18-src.tar.gz 6088118 BLAKE2B 7d3fdb5a682dd44d358a619a18ca3df3bde27c9fc963436c9bce86baf07a42e87ba80724afdc6ce72b493d2fb35dda644eba29df7d4434f8c815ada4cb5d2ca3 SHA512 001205f382f44163f08dba1d306472b7ef3256e31a522c3f1f7595bca4fd084776a0c1f69b241302fa5d0d2f143ac063cb34d4fcf79a51ec9722f2f2ce3f1dab DIST apache-tomcat-10.0.20-src.tar.gz 6097471 BLAKE2B 77df97d73ff87a5ad55dfc3a0df02e3a306e619a5ae4bd2df0a0e3d42d236ccf2c6a6c46f60f56311f9be1bd561be9096d810d932f136b5856ff275fb3ae8368 SHA512 1e75b0bad54a9fac6ddc650156fac88bc91933ff0bf4e9a62948f5e116454b6def10d7ad632968e709e8aac72b15c567e4497cdb9b594352cd12d7518fdaf18f DIST apache-tomcat-10.0.21-src.tar.gz 6109792 BLAKE2B c650a2e0cb8c6424d98539eaa802c788ff212b014e614123841a806fc9845a953911b5964f67cfc8c1f2ce33dfe627636b5af2f1eaa4b4c985ef4b78d0d831bf SHA512 925bb61ca8b6432e4aef5d5088838e811dbfc0a7b6190354b6ffd957d4ebf145ac1bf4a919b368def0cf63c86c28caf78faf78b190a6e54e085cbf4f108836a1 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e @@ -8,6 +7,5 @@ DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a88 DIST apache-tomcat-8.5.77-src.tar.gz 5963037 BLAKE2B 63192409b148cf0691e6ad22180e4f79d8603e89633598ee3f1dcfdd7d55b88530ecb1aa7c585920e086a7582dea78fcbcd1498ed2552e0f8d17127658769f66 SHA512 a0d2f77540b5370e09d03d04340e0c7f539eb5761b84ea3c8ef924e2a3e7f9528b3ed83a0c8e413bc9335cee6052135788e48e30d95f231ba3ade7f0b53ec157 DIST apache-tomcat-8.5.78-src.tar.gz 5972826 BLAKE2B 93acb2e997a877a2195642da7d896ec4f08bebd83aa12d868607056c23722bdb90147814173dde17fc142a9e4e434e4570a15ebfa1f8b1c7911a16408728b4bb SHA512 b58fdaa57420fcf7759420fba26bfd6edaa5174f5d3a81fdf8783f19d5385e2502d2ad4bfa0e4a77c6a084bf6d97a6d3cd274ab0ab3f2311d23079e273c41b32 DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff -DIST apache-tomcat-9.0.60-src.tar.gz 6143845 BLAKE2B af7061854659de06afa6a7cf6380c4be4375e18bec896049bf468ddb9139794170271454af4712ade5099b8d46ed7c8d642e9c5f37ea168f0e31394a5128beeb SHA512 e5cb12fb134ff0a59e01a30fbcabc350ddbef6959494176848c2858c3c68444bc520153e00fdcdecb0eefbe7f69876c2965fedbffeeb0aeda7931dc1c11b0de5 DIST apache-tomcat-9.0.62-src.tar.gz 6156545 BLAKE2B 414f4f7193a8db2bb3d0abcbd2d8c30ede5783e83ba01229ffb322e9bf6b08d2fb10d83ce4742d9e6a4ebc50c9b047679ae798fbd3db8ae165f76d2782034d71 SHA512 7e9cad2703473d9f096009c464b28d54d3765259fab1923ef8c9b1cbfa231fa51cedadfe771a3a95abffd258759a71023e036bda78b949440a5e826fbd4e9e09 DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild deleted file mode 100644 index 440d44e0a658..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.18.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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 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 -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild deleted file mode 100644 index f1c865a27bec..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.60.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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 4.0/JSP API 2.3/EL API 3.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.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 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 -}