gentoo resync : 06.12.2017

13 files changed, 87 insertions, 248 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9420a6d47c37..d5a39f31e41f 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest
index 5059284b7774..2923c856b256 100644
--- a/dev-java/lzmajio/Manifest
+++ b/dev-java/lzmajio/Manifest
@@ -1,3 +1,4 @@
-DIST lzmajio-0.95.tar.gz 20790 SHA256 d5856cad5909cfb2d808e64478904479905896df9b7433ee2276b527e4f8c04d SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5 WHIRLPOOL 13bef2b1eada5f02f6178af5ebb4634a328ceb5d5ac373d22d7b007aa4862c0525929878b9a24b01eb51889f906160493e7e7c51d9ec25f1ce6c83d23ee3097b
+DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5
 EBUILD lzmajio-0.95-r1.ebuild 644 BLAKE2B 77e8007928931edfc25b855a7985a4de800cf359f54f6564faa85168e022eebbfeb2558a8042c6db061f80143436ac77c81bf642a401e3bf535ea73568de0387 SHA512 3554e864b71be0267dae3a18dffef1efd70fd511873d3f96bf07c5475e6a1bc5632d3df1ec8f321bf087abc2169a48e7407d38f75f0a2267bd3c76f5965afa9e
+EBUILD lzmajio-0.95-r2.ebuild 629 BLAKE2B 58c69c94bf59836d68066292777f7eb9d99e24208b4c7140bbe8faa29e7438349779d84514ce1075b54c589dec9e985fc123dfd69fdcffbd63ec11d0fd524b83 SHA512 c168dba75eb7e9b97e788701c26ff0c57311578c2164cdd08ba48401391f7609bfee8c733bb6dc99f4923d9d6b23eea13955ed17d8d1c63abf8185d06937a5d4
 MISC metadata.xml 354 BLAKE2B 9b4fad4285c60df9a8341f2bb257e376cffc0fd483f4865850c24f43fe8d1770d7056297f773bef0b7d4f666eb5155753118b2394f85e7d45e0cc62713dc13de SHA512 75420fb1c8b1ebafdc3e237f34d2c70503166f248eeba6356d9bc703ca4c89a6dc2e28dd67b29fffe359f3b35bbc09539ade4f3c4b968fa1b76fb6481fd849dc
diff --git a/dev-java/lzmajio/lzmajio-0.95-r2.ebuild b/dev-java/lzmajio/lzmajio-0.95-r2.ebuild
new file mode 100644
index 000000000000..419b3afc2c7d
--- /dev/null
+++ b/dev-java/lzmajio/lzmajio-0.95-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 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-pkg-simple
+
+DESCRIPTION="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
+HOMEPAGE="https://github.com/league/lzmajio"
+SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/lzma:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="lzma"
+JAVA_SRC_DIR="net"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index b35b8fb68225..bc35f5cc73a4 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,13 +1,5 @@
-DIST tomcat-native-1.2.10-src.tar.gz 391853 SHA256 553a796f1efb9d52a22a24636baca45ae265327f2a2d2f3169436b4012df9c35 SHA512 ab12525e031f4b0221634bde0b3af826c2231a8655032917bd09fe26075cc8b9bce7a7c5de369f525230155d50ec41ff84fb074c45ef9f34319f910e907d66a6 WHIRLPOOL f6786ec3f9d5a8f8c9fb2ec174b7da637016019453575efa2e093b77fe2bfbfae653d9ac0c1199dea6391754a8b64e8601a29ec54818f353b2e3471e9057d0d4
-DIST tomcat-native-1.2.12-src.tar.gz 399836 SHA256 e7add177c98a7f07220c306d65e182c45dbcd7501115e9ed56f1690c5472ded9 SHA512 87543ab353545563001ac339834ec5b230a139bbeb7382c0b5b269d0d00875bfc3f5a3212923ca941e0d31aa0f60c34f34310e89794a99f37aafdaf9ecca7a99 WHIRLPOOL 71c92d599f24008a137124270d0b7af8ab680754520fcc386feac51226feffda2f72f9097129f32e77ed75752ee941440603088e323f682abd86a2ad9cf67fb4
 DIST tomcat-native-1.2.14-src.tar.gz 404159 SHA256 a7f1649f7c384b2d4e6c4c96f20aea980efeba327dba874d4bc7c765b6229f5e SHA512 ddfc44f07dc4200f8ef20b5425355d2737a7510e41660002553c04e7451c48e4f54f4cfb462ed6bea1fad1ea60525a7ce3787af74e6a4b795f9dd1862b75c633 WHIRLPOOL 33b4d60a9895645b049d69c8b70105fd54ec48f1d0b14e96b1ade96973473842f4b447824d3e2b9985ec73235b72c94cf70e7a089620c3ed424cb4dc16a79db7
-DIST tomcat-native-1.2.4-src.tar.gz 387352 SHA256 29d53d4646229a839ccb71b7b3caa25c256aab1965c33cc9d140247213b9b171 SHA512 c080867510fb9006832172ee0b1997cee067c6e0275b3f9bdf94f69c14b9a02317352d9cadd8a41d366fb5f25c42f7f8af419e0b699aaa5eefee20db96559e97 WHIRLPOOL bf0acc6a78a79b51d3802fb1e1bfb0ec3e71993723a1be58c5ac14d6d24bab6e54fc9d505e4d5c0852ce335b6edc47c6b57f99055c875258fa0414a702e06fb2
-DIST tomcat-native-1.2.7-src.tar.gz 390573 SHA256 19e87bc6ea7f763bf9e6515f8c31d8e9bb3e0c1132b36769cdf32c6702723d25 SHA512 3d973d65969e52f0b7a8ea24736926e205b1e95bf80ed4a79bdfeeefb59b7494b3cb1618a0a24afcd026c946f9bf4d3d4b3800eecdf001cc50d814981edc2733 WHIRLPOOL 613cdc15c4ee7305303096fa099f553d065cc898696c09b060bc1d57522ac9c445a34ebe9883e240f9a7ab9ed77b1cb3cd492a723281bcbda2f60e0b399e2a64
-DIST tomcat-native-1.2.8-src.tar.gz 391842 SHA256 408ece0b027c8967b3aa85533c5fca642827e235b1857d28df918a4eab861d30 SHA512 4e9fde4a9fbec73813eb8a42d3ee1728b6ba64f04a007d15f89dfa7e7380af95586f843091d7691e84b84062824b3ce7a0a6c3402dfe31de352d8884652b7b83 WHIRLPOOL 6165552f88b5dab32f0046252989f5ae603b5195744d03b9348cad047af178a20766ccf1062701dafe844b65eaefadac914666e5d30104ef65c6657a3fbdf94c
-EBUILD tomcat-native-1.2.10.ebuild 1172 BLAKE2B b70afc860326b3e42a8324f5d39243a36732cf4d8815f63be5eab83ecc9b3415568ab45affa6b4ee16ad752ef73a7debb498a8a3f2fca3a14bb2fbc28090e6c6 SHA512 2ea80842649784856f9c004240215595c937fe199988960642196b5e26480e28375dd897d560f4a6e2cdb23fe76ca012fc9b06c0d56030c24bbed7afac22d22a
-EBUILD tomcat-native-1.2.12.ebuild 1172 BLAKE2B f17be8a7028a0a6a53c577385408ef142bbdf031e596370a352de4dd76b8c6ba61e3dc579d259408ff8064af000bd60d58b9e1e9f07baab93f443cfb3ca8343d SHA512 9c0fb8daf47a0a19370c33fb3e11c9033a024e8c3c866151acc6d377c1e6b3d86e68e93518e6dab0e8d94ec81888ffdd3455e6174b8cef6d53b5111aec56e53e
-EBUILD tomcat-native-1.2.14.ebuild 1172 BLAKE2B f17be8a7028a0a6a53c577385408ef142bbdf031e596370a352de4dd76b8c6ba61e3dc579d259408ff8064af000bd60d58b9e1e9f07baab93f443cfb3ca8343d SHA512 9c0fb8daf47a0a19370c33fb3e11c9033a024e8c3c866151acc6d377c1e6b3d86e68e93518e6dab0e8d94ec81888ffdd3455e6174b8cef6d53b5111aec56e53e
-EBUILD tomcat-native-1.2.4.ebuild 1170 BLAKE2B 1546467dfcfb273d8c1ee1a1446b642f3432e6e048edc8b7540a290aaeebe00b1be33b9a6d7d9189938427b8b0e79f521c459ab24cb6605612730bef297f6ea5 SHA512 3ebaca571bf98bceeb294578a0fd8048bf95dfc93838d58d23e2d4148e7b40ff899ac27a5d7284de180937c2dd53c2e30d2591c33572953e542878c72ff46f14
-EBUILD tomcat-native-1.2.7.ebuild 1172 BLAKE2B b70afc860326b3e42a8324f5d39243a36732cf4d8815f63be5eab83ecc9b3415568ab45affa6b4ee16ad752ef73a7debb498a8a3f2fca3a14bb2fbc28090e6c6 SHA512 2ea80842649784856f9c004240215595c937fe199988960642196b5e26480e28375dd897d560f4a6e2cdb23fe76ca012fc9b06c0d56030c24bbed7afac22d22a
-EBUILD tomcat-native-1.2.8.ebuild 1170 BLAKE2B 6f1eff6070ed5a81fafb9f51912def58d8affe521f6d7c560c033134a3733ea96db25bb0c5ba614e12c0e4190b8784b0df982b741e0c50b562ec014ca0d98f6b SHA512 b31953274b0282804d1f69a10224b64a7408d358d021916ec94c9acc60afb8dec796e3d32d09191a276a852960017537171b632f8f045b3fde4a9bd0fa0812a4
+DIST tomcat-native-1.2.16-src.tar.gz 405109 BLAKE2B e153caeb82c4ac4d2a8c7c24373204edf6e691068e70c858618caf72faaee1f4d10c4529ba758e24422e8580e8b3e95d28cc942998568106ec60b8de7c196c51 SHA512 0345f85fbab406f25c25c8fc06bf55f3d166fa14bfcf542bddb5dc5db4c8c7bd0c5b71603d85261d71152ead3023b112144f2ffa5ede14ae8595013f79c802aa
+EBUILD tomcat-native-1.2.14.ebuild 1173 BLAKE2B 2ebf16043de5ea3f481f1ff6c8831197b8bfed9be0f26fac4fb4f5aa007d27fdf5e1d32ba23f6c991610e38f908918d801737a31ecad9e3d0c4e220ea46e4047 SHA512 0d289ef31795c99b933b2aaaca054533c0a53c285725c479d0a0b381dee0a2b7f75d237b38a430160f737a904fec872fee91d862ddced32eb1b5b7ffafd5a2e5
+EBUILD tomcat-native-1.2.16.ebuild 1239 BLAKE2B 5b931cecf94ba1245c896b9b4d32a020c904ff50a33d14915e1bb9b9fa94085e6d1e71432f4022244e4c062a93a885ed4bda1eac61bc6b33914da6d533e4803b SHA512 5ce233f8a7bbc2f9897d6a79c4c358a15fc42c0f0c4d63f210877d6873f48e014c03db004929633f5054e7dcd4d38229f00a538af231bb0eff0957d1ae77f7ed
 MISC metadata.xml 798 BLAKE2B 2c486251ad603082b61c08a26509895fda8c10ce59d66eafe550ff4854bc5049005de637c22cc77d4d5b7b0a804aacf4a6860a04134ce2dde0480e3275c1c82d SHA512 4074e9797b397fe24ee0ad0c56e7ba3504212a008a2d595a96cf4495dbaec38ebbb9ac4d48a55bbcf7b28d97951dde2a2ee2eeb135419114096aa4892ccb2269
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
deleted file mode 100644
index 511f3db5d560..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
index f361a5a91e31..de20842d0358 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
@@ -9,8 +9,8 @@ DESCRIPTION="Native APR library for Tomcat"
 
 SLOT="0"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://tomcat.apache.org/"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 IUSE="test"
 
@@ -50,7 +50,7 @@ src_test() {
 pkg_postinst() {
 	elog
 	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog " please see https://tomcat.apache.org/tomcat-6.0-doc/apr.html"
 	elog
 	elog " Please report any bugs to https://bugs.gentoo.org/"
 	elog
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
index f361a5a91e31..032c45a23960 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.12.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
@@ -9,10 +9,10 @@ DESCRIPTION="Native APR library for Tomcat"
 
 SLOT="0"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
+HOMEPAGE="https://tomcat.apache.org/"
 KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
-IUSE="test"
+IUSE="static-libs test"
 
 RDEPEND="dev-libs/apr:1
 	dev-libs/openssl:=
@@ -41,6 +41,8 @@ src_install() {
 
 	cd native
 	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+
+	! use static-libs && prune_libtool_files --modules
 }
 
 src_test() {
@@ -50,7 +52,7 @@ src_test() {
 pkg_postinst() {
 	elog
 	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog " please see https://tomcat.apache.org/tomcat-6.0-doc/apr.html"
 	elog
 	elog " Please report any bugs to https://bugs.gentoo.org/"
 	elog
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
deleted file mode 100644
index a102a0a83832..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
deleted file mode 100644
index 511f3db5d560..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
deleted file mode 100644
index 484cf6a65d9e..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index d237e3e89968..2e0b67936e14 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -14,7 +14,8 @@ DIST apache-tomcat-7.0.82-src.tar.gz 4697342 SHA256 3c6ff0bf2770b169493b25b97ee7
 DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
-DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
+DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc
+DIST apache-tomcat-9.0.2-src.tar.gz 5047832 BLAKE2B 7be9cb7569fc771fab849cfe0b3e8154482fd97c2b74f46ebf457084e7f40d8bc70dd9d96793b6b6b43bcb64537dfab4360ea2fe6d3c437788263871944c19cc SHA512 463c0e8daa656dcd8193b3cdbec89bffa762c90b15933755fa51bc2268c28e142544fe71da1d459befb42b70d14834313de30a7f49a082e5121cf3f553c35cbe
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
 EBUILD tomcat-servlet-api-3.ebuild 851 BLAKE2B 9c746f46ebda7ed63c25c2374e3b56e4d09c170faf2348f20897ff5935221d5a244498eb5d535281fdbbe2323ccbbb3671c1fcd7058a288926792bb354398317 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0
 EBUILD tomcat-servlet-api-4.1.36.ebuild 984 BLAKE2B da61c35c91151f3714592e412f21e75451b0455e699a5f52d33fdf177ff10af36129cf04467c42502ce8528bac9f33bb66f867bfd8eead03b4307e0f56082ddf SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63
@@ -27,5 +28,6 @@ EBUILD tomcat-servlet-api-7.0.82.ebuild 928 BLAKE2B 1bde5610507919c8ea5926e62d9f
 EBUILD tomcat-servlet-api-8.0.47.ebuild 986 BLAKE2B 53ee4734e1be43aebea30162b72d66c058da698e6220c9dba1961871fcf0619c46ad56b3ff4d9b035a68767c13881747670cdd75498d7a7535a2d1bdd74449cc SHA512 0d6034c322f7c5b09c093312b6316148a74261cc8889a6cb6040dad41134e451dbb2b42820c62a73a19645bd652e9f3cf8071235b10c7499fb3053acb464592e
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 BLAKE2B 491898f79d1185a9a0c0580ca30936b5ccceab95eada32b7c12ba77f802bfabc92b22c6bfb253eb2346ab0cae1264c664b4a63efee67ec4b2c66d4cf40881386 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1033 BLAKE2B 6c5d35a13ac371445d39b9359cf1ac917a7d8d08692d6ea730c1d4c2a305319eac90697305d6d1bd3625478d63af74c4c62f15b78b33638d1f3a5c8d2b328ba4 SHA512 c6c829d08c1b04a737bcc0519396bd97dc52993e33bdfb550c7dcb8e2e8cedba93123e7c852f6c7100f989c9af882b2ab2d81925ce545e95172dd7c3f1a75c5c
-EBUILD tomcat-servlet-api-9.0.1_beta.ebuild 1057 BLAKE2B 09d2eae655c8c3bac49cd39b48851f6062625eae1706e8f85ec2f4b218c055deeca1a47882fb1c8c386483c666b0fc2cafe483c7957b29f40176f42792c88d0a SHA512 f8c9dde308a0a45c0bf05068474a87219ec43148507986acfe52aa08c35a7cc02421597f89c18f03da8bd4f68a7a4bbd8f1e7d539b21698593ee8023ee2575c4
+EBUILD tomcat-servlet-api-8.5.24.ebuild 1035 BLAKE2B 45ce444889c27792361db95b35b2d10e235e2778d44b01725f1cdae10c6088d4f3f2b9c941ce9b255505665ac328f1bd86a2c8542b3a8375b8e2de0b4cc95bb9 SHA512 355eee48ce5c0c5b0db44a7d4d0199ed4b11b2f59ea9b2395164673432245511df316e84402289ab7d93df223a3e1ba434ff2edc4aa1085b9a4e92a42950fc7b
+EBUILD tomcat-servlet-api-9.0.2_beta.ebuild 1057 BLAKE2B 09d2eae655c8c3bac49cd39b48851f6062625eae1706e8f85ec2f4b218c055deeca1a47882fb1c8c386483c666b0fc2cafe483c7957b29f40176f42792c88d0a SHA512 f8c9dde308a0a45c0bf05068474a87219ec43148507986acfe52aa08c35a7cc02421597f89c18f03da8bd4f68a7a4bbd8f1e7d539b21698593ee8023ee2575c4
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
new file mode 100644
index 000000000000..4fcff024f711
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.24.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 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-fbsd ~x86-fbsd ~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.1_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild
index 94987d88ef53..94987d88ef53 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.2_beta.ebuild