[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-java/servletapi/

[Michał Górny]

commit:     612ef9d514f116b1afefe4f57b96ef17d9f7ea9c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 12:13:25 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 12:15:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612ef9d5

dev-java/servletapi: Remove last-rited pkg

Closes: https://bugs.gentoo.org/398689

 dev-java/servletapi/Manifest                 |  3 --
 dev-java/servletapi/metadata.xml             | 11 ------
 dev-java/servletapi/servletapi-2.2-r3.ebuild | 37 --------------------
 dev-java/servletapi/servletapi-2.2-r4.ebuild | 41 ----------------------
 dev-java/servletapi/servletapi-2.3-r3.ebuild | 33 ------------------
 dev-java/servletapi/servletapi-2.3-r4.ebuild | 37 --------------------
 dev-java/servletapi/servletapi-2.4-r5.ebuild | 49 --------------------------
 dev-java/servletapi/servletapi-2.4-r6.ebuild | 52 ----------------------------
 profiles/package.mask                        |  1 -
 9 files changed, 264 deletions(-)

diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
deleted file mode 100644
index 23f5aa43569..00000000000
--- a/dev-java/servletapi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST apache-tomcat-5.5.20-src.tar.gz 4796377 BLAKE2B 34950d25c969006510dcff96deded7d0f05c7fa99cde0a8e59b22a93261dd6dca56c82aa281d1476324a4c3b608d2d31ffa6c4a03506d46ba187051ea5addf1c SHA512 1efab4625067ee423cd517b565b2d368bf3e19fd5fddedcb87644bdc5fc213cc7617e62438fd8da19d9dff99e13c5d6d9185f12849f7ce42efad52ff2d4df5f5
-DIST servletapi-2.2-20021101.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
-DIST servletapi-2.3-20021101.tar.gz 127874 BLAKE2B f78f8d0724e73ef4a21bbbef6a1b855c0a55c158dba2e3ed3ee7b6d48a60ce87881bbe6b38bf5098f48f1c3064bc73c072a485e550c1caf920710ecd6e27519f SHA512 a09a5e0cd7b8c557fca983646dc49284350ff9cac7a288013c6c4c7582923d1b16d6e6b68c73e74bc06fad628ab81da95e201106643b8f6564f984a9587bd03d

diff --git a/dev-java/servletapi/metadata.xml b/dev-java/servletapi/metadata.xml
deleted file mode 100644
index 61b379cee8a..00000000000
--- a/dev-java/servletapi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-	The Apache Tomcat implementation of the Servlet API specification.
-	</longdescription>
-</pkgmetadata>

diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
deleted file mode 100644
index c2be8d3bd27..00000000000
--- a/dev-java/servletapi/servletapi-2.2-r3.ebuild
+++ /dev/null
@@ -1,37 +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
-
-DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-1.1"
-SLOT="2.2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc"
-S="${WORKDIR}/jakarta-servletapi-src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i 's/compile,javadoc/compile/' build.xml || die "sed failed"
-}
-
-EANT_BUILD_TARGET="all"
-
-src_install() {
-	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
-
-	dodoc README || die
-	use doc && java-pkg_dojavadoc ../build/servletapi/docs/api
-	use source && java-pkg_dosrc src/share/javax
-}

diff --git a/dev-java/servletapi/servletapi-2.2-r4.ebuild b/dev-java/servletapi/servletapi-2.2-r4.ebuild
deleted file mode 100644
index e1a24d42146..00000000000
--- a/dev-java/servletapi/servletapi-2.2-r4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	dev-java/ant-core:0
-	source? ( app-arch/zip )"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-LICENSE="Apache-1.1"
-SLOT="2.2"
-IUSE="doc"
-
-S="${WORKDIR}/jakarta-servletapi-src"
-
-EANT_BUILD_TARGET="all"
-
-src_prepare() {
-	default
-	sed -i 's/compile,javadoc/compile/' build.xml || die "sed failed"
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
-	use doc && java-pkg_dojavadoc ../build/servletapi/docs/api
-	use source && java-pkg_dosrc src/share/javax
-}

diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
deleted file mode 100644
index 5fc18936fa1..00000000000
--- a/dev-java/servletapi/servletapi-2.3-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Servlet API 2.3 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.3"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-S="${WORKDIR}/jakarta-servletapi-4"
-
-src_compile() {
-	eant 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/servletapi/servletapi-2.3-r4.ebuild b/dev-java/servletapi/servletapi-2.3-r4.ebuild
deleted file mode 100644
index 2c264a86989..00000000000
--- a/dev-java/servletapi/servletapi-2.3-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Servlet API 2.3 from jakarta.apache.org"
-HOMEPAGE="https://jakarta.apache.org/"
-SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
-
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
-LICENSE="Apache-1.1"
-SLOT="2.3"
-IUSE="doc source"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	>=dev-java/ant-core-1.4
-	source? ( app-arch/zip )"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/jakarta-servletapi-4"
-
-src_compile() {
-	eant 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/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
deleted file mode 100644
index 6c22f6744b7..00000000000
--- a/dev-java/servletapi/servletapi-2.4-r5.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
-
-TC_VERSION="5.5.20"
-DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
-HOMEPAGE="http://jakarta.apache.org/"
-SRC_URI="http://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.4"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.4"
-
-S="${WORKDIR}/apache-tomcat-${TC_VERSION}-src/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-pkg_dojar *.jar
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
-}

diff --git a/dev-java/servletapi/servletapi-2.4-r6.ebuild b/dev-java/servletapi/servletapi-2.4-r6.ebuild
deleted file mode 100644
index 13f902f52c0..00000000000
--- a/dev-java/servletapi/servletapi-2.4-r6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils java-pkg-2 java-ant-2
-
-TC_VERSION="5.5.20"
-DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
-HOMEPAGE="https://jakarta.apache.org/"
-SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_VERSION}-src.tar.gz"
-
-SLOT="2.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-1.1"
-IUSE="doc source"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	dev-java/ant-core:0
-	source? ( app-arch/zip )"
-
-RDEPEND="
-	>=virtual/jdk-1.4"
-
-S="${WORKDIR}/apache-tomcat-${TC_VERSION}-src/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}" || die
-
-	if use doc; then
-		mkdir docs || die
-		cd "${S}"/jsr154/build || die
-		mv docs "${S}"/docs/servlet || die
-		mv examples "${S}"/docs/servlet/examples || die
-
-		cd "${S}"/jsr152/build || die
-		mv docs "${S}"/docs/jsp || die
-		mv examples "${S}"/docs/jsp/examples || die
-	fi
-
-	cd "${S}" || die
-	java-pkg_dojar *.jar
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 359d07e5b1f..d1072187c0a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -218,7 +218,6 @@ games-arcade/xevil
 
 # Pacho Ramos <pacho@g.o> (17 Jun 2018)
 # Package obsolete since many years ago (#398689). Removal in a month.
-dev-java/servletapi
 dev-java/sun-jacc-api
 
 # Pacho Ramos <pacho@g.o> (17 Jun 2018)