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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED3E71382C5 for ; Thu, 17 Jun 2021 07:06:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16F8CE0829; Thu, 17 Jun 2021 07:06:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6F99E0829 for ; Thu, 17 Jun 2021 07:06:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78502340845 for ; Thu, 17 Jun 2021 07:06:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A15857AF for ; Thu, 17 Jun 2021 07:06:42 +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: <1623913596.0c6b68ce76b8cd7814e2f70ca819711320400225.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.5.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild X-VCS-Directories: dev-java/tomcat-servlet-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 0c6b68ce76b8cd7814e2f70ca819711320400225 X-VCS-Branch: master Date: Thu, 17 Jun 2021 07:06:42 +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: 27e02edb-d5be-4e6a-911d-967e1fbeb501 X-Archives-Hash: 02380be9bbe176c62b442eade4d6e572 commit: 0c6b68ce76b8cd7814e2f70ca819711320400225 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Jun 17 07:06:19 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jun 17 07:06:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c6b68ce dev-java/tomcat-servlet-api: removed obsolete 8.5.65, 9.0.45 & 10.0.5 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 3 - .../tomcat-servlet-api-10.0.5.ebuild | 103 -------------------- .../tomcat-servlet-api-8.5.65.ebuild | 99 -------------------- .../tomcat-servlet-api-9.0.45.ebuild | 104 --------------------- 4 files changed, 309 deletions(-) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 9f74ceb0aed..6d3f07bcfc2 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,10 +1,7 @@ -DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f DIST apache-tomcat-10.0.6-src.tar.gz 5987333 BLAKE2B b955d3708555c5530ebccaf9c6e8c344a679666bdd45361980d722d2cb48b618a03dc2514f973c182c2c1eaf96852e5a5eadad89575ee1bf524213211191a6a4 SHA512 229e8767b8f53f6b5c0e28f13a1daffd6fb8307a5239ae28ee1522087d881e4c9e3f1a0d39bfc852d5e54166dbb8a0a1577210a325845815c7281c4babc0b100 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 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce -DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b -DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild deleted file mode 100644 index 3bb2fe1d1a9..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.5.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 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-${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}/" - -# we don't have the aQute.bnd.annotation.spi packaged -PATCHES=( - "${FILESDIR}/${PN}-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch" -) - -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-8.5.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild deleted file mode 100644 index 8846bfbc900..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 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 -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild deleted file mode 100644 index 6a6fd33a63f..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 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-${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}/" - -# we don't have the aQute.bnd.annotation.spi packaged -PATCHES=( - "${FILESDIR}/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch" -) - -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 -}