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 4F369138334 for ; Mon, 21 Oct 2019 08:22:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77B8BE08BE; Mon, 21 Oct 2019 08:22:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 5264FE08BE for ; Mon, 21 Oct 2019 08:22:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1B90834BD9B for ; Mon, 21 Oct 2019 08:22:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90D9F7F8 for ; Mon, 21 Oct 2019 08:22:01 +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: <1571646109.9f234f98b188aa0fbd3e0c31e02c92cae565e38c.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-4.1.36.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild X-VCS-Directories: dev-java/tomcat-servlet-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 9f234f98b188aa0fbd3e0c31e02c92cae565e38c X-VCS-Branch: master Date: Mon, 21 Oct 2019 08:22:01 +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: f21b6cd2-d3bd-4b07-b8b9-a83300bcd9fd X-Archives-Hash: e42f095c088714c900ba55af9fa822de commit: 9f234f98b188aa0fbd3e0c31e02c92cae565e38c Author: Miroslav Šulc gentoo org> AuthorDate: Mon Oct 21 08:16:04 2019 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Oct 21 08:21:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f234f98 dev-java/tomcat-servlet-api: removed obsolete Bug: https://bugs.gentoo.org/697530 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 8 ---- .../tomcat-servlet-api-4.1.36.ebuild | 38 ----------------- .../tomcat-servlet-api-5.5.27-r1.ebuild | 49 ---------------------- .../tomcat-servlet-api-5.5.34.ebuild | 49 ---------------------- .../tomcat-servlet-api-6.0.44-r1.ebuild | 34 --------------- .../tomcat-servlet-api-7.0.82.ebuild | 38 ----------------- .../tomcat-servlet-api-8.5.23.ebuild | 39 ----------------- .../tomcat-servlet-api-8.5.43.ebuild | 39 ----------------- .../tomcat-servlet-api-9.0.24.ebuild | 39 ----------------- 9 files changed, 333 deletions(-) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 283ccf8723a..e67ec487cf5 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,18 +1,10 @@ -DIST apache-tomcat-4.1.36-src.tar.gz 3715200 BLAKE2B 0af7c15e821c7b437c4a12c07aa6943184d3bb6c08f925c09e0357f3b7cdd87b17d5303725560508480646e89cfcbaae671527ca4879adb26085855e15139b93 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e -DIST apache-tomcat-5.5.27-src.tar.gz 7382057 BLAKE2B 289c586c9664efb63f921bffab80a180639ff4c14cc1f676cb7aff27c9416a20e142bc56862c0a06b26d30bc5a7415b07c0b7c3263286af860b27ee940f745b4 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a -DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e06932b214d9740c56e95468f45d2f4ea0e157f9bd33dcc715ace9f950761b1fbfd7a5cbf9fec47f98feb1088641a24de4a8f4a SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 -DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c -DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 -DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef -DIST apache-tomcat-8.5.43-src.tar.gz 5283886 BLAKE2B 2d76e66eedf4de474d439289a9a491e5c490e2373bc91ae30113b8f3c624255339d24149b58fba640aaf3131ab3c9a449930049d26928627e1b7910f0cddd40f SHA512 f6a0439dbfd3f233bd1eb395d37466ba2cce32cd456d067fb2bb45099ac173dec7e42e7fbfab2cb50c0fce2e9dba1f1afe6c8d65877525cb13cb116489cf27a7 DIST apache-tomcat-8.5.45-src.tar.gz 5324847 BLAKE2B 5ef3388b9324bb04772543c03686057b3035f5a5f40009d0aa1ec34fe18d04af87527bcc9ae0566f41faf64de8ce191f8ea4e2ed2869da569777621aad227d6c SHA512 1fe94b9d5ccf63d2c5fc3dd7a47dabade160ed2882848e0a41422b5a67215d53e8265535ee8e645157d56c4eba9093722982684be6668064648b0782fc48927a DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 -DIST apache-tomcat-9.0.24-src.tar.gz 5746934 BLAKE2B fe0ff76fd8b3caa2860c0798d66f0dfff1e907ca02d10913c768d8513b207ef11e8fe885cd7578348136b8d007e08ccc2044952198259ffcdb2d58acf9fbb8b6 SHA512 de11d0e992cce08edb83474bd4cab04857e3e2bf63ef334c8c9f3ad053edcc76691e831cc95b8c489b820773a6fa5d2755837b470d73471f9587bb7062d75a31 DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild deleted file mode 100644 index 2f41ffe1c39..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="apache-${P/-servlet-api/}-src" -DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz" -DEPEND=">=virtual/jdk-1.4" -RDEPEND=">=virtual/jre-1.4" -LICENSE="Apache-2.0" -SLOT="2.3" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" -S="${WORKDIR}/${MY_P}/servletapi" - -src_unpack() { - unpack ${A} - cd "${S}" - - einfo "Removing bundled jars and classes" - find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete -} - -EANT_BUILD_TARGET="all" - -src_install() { - java-pkg_dojar dist/lib/servlet.jar - - use doc && java-pkg_dohtml -r dist/docs/* - use source && java-pkg_dosrc src/share/javax - dodoc dist/README.txt -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild deleted file mode 100644 index cf40088c58e..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils java-pkg-2 java-ant-2 java-osgi - -MY_P="apache-${P/-servlet-api/}-src" -DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.4" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc source" - -DEPEND=">=virtual/jdk-1.5 - source? ( app-arch/zip )" -RDEPEND=">=virtual/jdk-1.5" - -S="${WORKDIR}/${MY_P}/servletapi" - -src_compile() { - local antflags="jar $(use_doc javadoc examples)" - eant ${antflags} -f jsr154/build.xml - eant ${antflags} -f jsr152/build.xml -} - -src_install() { - mv jsr{154,152}/dist/lib/*.jar "${S}" - - if use doc ; then - mkdir docs - cd "${S}/jsr154/build" - mv docs "${S}/docs/servlet" - mv examples "${S}/docs/servlet/examples" - - cd "${S}/jsr152/build" - mv docs "${S}/docs/jsp" - mv examples "${S}/docs/jsp/examples" - fi - - cd "${S}" - java-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle" - java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle" - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc jsr{152,154}/src/share/javax -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild deleted file mode 100644 index 845323077d0..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.34.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils java-pkg-2 java-ant-2 java-osgi - -MY_P="apache-${P/-servlet-api/}-src" -DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.4" -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc source" - -DEPEND=">=virtual/jdk-1.5 - source? ( app-arch/zip )" -RDEPEND=">=virtual/jdk-1.5" - -S="${WORKDIR}/${MY_P}/servletapi" - -src_compile() { - local antflags="jar $(use_doc javadoc examples)" - eant ${antflags} -f jsr154/build.xml - eant ${antflags} -f jsr152/build.xml -} - -src_install() { - mv jsr{154,152}/dist/lib/*.jar "${S}" - - if use doc ; then - mkdir docs - cd "${S}/jsr154/build" - mv docs "${S}/docs/servlet" - mv examples "${S}/docs/servlet/examples" - - cd "${S}/jsr152/build" - mv docs "${S}/docs/jsp" - mv examples "${S}/docs/jsp/examples" - fi - - cd "${S}" - java-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle" - java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle" - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc jsr{152,154}/src/share/javax -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild deleted file mode 100644 index 8ecab83cc46..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${P}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.5" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}" - -java_prepare() { - cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml" - rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die - find -name '*.jar' -delete || die -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild deleted file mode 100644 index 8349619ca6c..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.82.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${P}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="3.0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml ||die - java-pkg_clean - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild deleted file mode 100644 index df5d6f08c21..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -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 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.7" -RDEPEND=">=virtual/jre-1.7" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml - einfo "Removing bundled jars and classes" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild deleted file mode 100644 index 640c06837c8..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.43.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.7" -RDEPEND=">=virtual/jre-1.7" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml - einfo "Removing bundled jars and classes" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild deleted file mode 100644 index d66f7a81553..00000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.24.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${PN}-${PV}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? 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 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml - einfo "Removing bundled jars and classes" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -}