gentoo resync : 02.01.2018

5 files changed, 133 insertions, 0 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 379c621be9a0..458f7ce62f5d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index c959763b2f49..6850ef9c8064 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -2,6 +2,9 @@ DIST apache-tomcat-5.5.20-src.tar.gz 4796377 BLAKE2B 34950d25c969006510dcff96ded
 DIST servletapi-2.2-20021101.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 DIST servletapi-2.3-20021101.tar.gz 127874 BLAKE2B f78f8d0724e73ef4a21bbbef6a1b855c0a55c158dba2e3ed3ee7b6d48a60ce87881bbe6b38bf5098f48f1c3064bc73c072a485e550c1caf920710ecd6e27519f SHA512 a09a5e0cd7b8c557fca983646dc49284350ff9cac7a288013c6c4c7582923d1b16d6e6b68c73e74bc06fad628ab81da95e201106643b8f6564f984a9587bd03d
 EBUILD servletapi-2.2-r3.ebuild 874 BLAKE2B b6c3368581a30f5f2247ccbe25eb90954170d2a138c6cb3058c3ebaed6159acb90a49f0f0cf27f87ae0e11230d3ba2de956fb9e6671cb2461c50df0d9503bc0e SHA512 7dd16250131c84424a81bd038e86956af8c871ca12fe77b335e2d328858fd5f30f138c5f2c7a93d2b797641a8af7459e6f401b37a914927818ddd9f132f16f67
+EBUILD servletapi-2.2-r4.ebuild 892 BLAKE2B 2178343174013bb43a8825ac28ba4b92be44f3337f8fb8ba2b1996bd4c2681073f8a1c2462cdb6c9b20253e7db37667cda80dd62a084bfdafa690cc778d454f7 SHA512 e4ef54d6bb90f70f605136e6a4bbe67df9bb9d6fca348cbf0dd070e2002cd6e3a04be54dddf6998f80d8ccb785b47e677d21e3f930f12c9b3e892572d48500df
 EBUILD servletapi-2.3-r3.ebuild 755 BLAKE2B 7e67fce7bbcb034fcc55445bd97aab8f2be2dd7332085ed190b181221a44673ed01efaf05bcfdcf6cf2105c12d1a11c83c7e6254e3a2dfb102b895142f188e14 SHA512 c47fa89bab9b9c65be375b99f19fb5467907806c4363609e4b443ce7e836fdaa1a9e183c970a8c4dfae738d7c392523371b1dcca03f3b49d876bc66d15e318fc
+EBUILD servletapi-2.3-r4.ebuild 773 BLAKE2B baf73c7efe1b1f57a7f00414b38b3435dd5fcece5235f3489a82288df9424f0bb883685b28f086dfe1b86c8f8382153b928e22f26568da3fec61ba799a74d1b1 SHA512 9138e2b14e89f8207b2d3b2d59e4ab4f67ce08acb315875ef9d934a8bad3d7480e1c881e08a1a4e99655667db4f741e222063c31c7578477051cc33fbb74cdcb
 EBUILD servletapi-2.4-r5.ebuild 1261 BLAKE2B 5f8c59c80da9054cd134fd48e449f5d2786c34ee7969f3755379efe8625e8595eac46e709ddcfbf140a5a887a750cba5225b49c1a21f18a4f3e3d17592d77016 SHA512 4e00cc80f7ef0e92922ba2bfb89fa7c5225e97ef41288e0ba096078363c8c06894b343fa98d4cdc050cc7ef8a4b9e210da441992c304aaef11a7806433176966
+EBUILD servletapi-2.4-r6.ebuild 1337 BLAKE2B eb13c2dcf08df9e65bbe52ece293fb5b79210df384e25664e8a2f578f388ab24fde6527a1e7c2ec18e0a399fd44774ecbe681f644fdd4cce2c26e4cc30b66796 SHA512 4d3d77095a9d1e133e08addcf55d558c4c6572110fe9482baa98543df20f862ecf29aa06794c7d3c95cb8336e9aa3bc6a665084df85a4bdb14dd492de7052d70
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/servletapi/servletapi-2.2-r4.ebuild b/dev-java/servletapi/servletapi-2.2-r4.ebuild
new file mode 100644
index 000000000000..0cbcbc065829
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r4.ebuild
@@ -0,0 +1,41 @@
+# 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 ~x86-fbsd ~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-r4.ebuild b/dev-java/servletapi/servletapi-2.3-r4.ebuild
new file mode 100644
index 000000000000..bb0d308808e8
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r4.ebuild
@@ -0,0 +1,37 @@
+# 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 ~x86-fbsd ~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-r6.ebuild b/dev-java/servletapi/servletapi-2.4-r6.ebuild
new file mode 100644
index 000000000000..730650e38210
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r6.ebuild
@@ -0,0 +1,52 @@
+# 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 ~x86-fbsd ~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
+}