gentoo resync : 15.12.2019

7 files changed, 16 insertions, 51 deletions

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e6abd5d9ff0a..3e87e88bca70 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,19 +8,18 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 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.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-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.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
+DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
+DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
-EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 965 BLAKE2B 01b1cec108dad93539e7d7f5b4e13db3f51cda7406d9a64be1ed45adf86feb8630870ca2f0b8e6531e42fe1569bc98219f9fc3e3a57d37583287353d1061fd3f SHA512 518a207337802c8f92fa5e5305fca8f891f45475b4aff625c5798243c4eddb83a2c287f5acb6f2d0075299a6a4de8a0a55c5fcd37d3081823409d5b003773605
-EBUILD tomcat-servlet-api-6.0.53.ebuild 938 BLAKE2B 60720f202a842d68d95ace516b2adfd8b5cb93d3a60d4f6ea642acd813a0523d29ad76e905c7805c1105a7149f5535fc8884fd9656199f8bf91999cc06fa726d SHA512 e5a82261c733db892d609ffd6d0c404abcb2b6c67bdd2d86dfc413573c2edfdaaa8f240b4865a97991719cf2edfe6ae610d266954a955ad3c26db30ba6af9adb
+EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.96.ebuild 903 BLAKE2B 96a68aedd7a8659c8e28026ba7bafb0f6ac8b468a95daf136eb44ef793b36e3d7adf16f1bf3f01bda4f198cbdd9f792051c492e47e5adf2b45f35d9e2b2d2702 SHA512 0867575b7ce8681f4a15edcdf70ed1ed3bb82bbed97128e238d650726e29e66f48dd2bbea4153e1426c24eb30b49b5eb783407533612336d1f5230d05a882eda
-EBUILD tomcat-servlet-api-8.5.46.ebuild 1007 BLAKE2B 6671b9a1acb4c81bc4f6fabd0cefa9474802071b8d674784cb008af1418183496cad29a6d1ab4ce285d9a5e036f099f034258fafe399c540fb60e3fa8ea0333c SHA512 2d78ce62cd3b66281a05681e53cc5f584fd301ad5971f22d971feabd692848f8eb7813da557f175032fbb7e9544dc10b9d63516317ae45035e592e306a4aad17
-EBUILD tomcat-servlet-api-8.5.47.ebuild 1008 BLAKE2B b0a72cde70dc747a59e3132f9e7137b9357e96246e3aff202fa2915f2bb8b605984861abfb2d6cbab144d829469b26644e8a996dca682d41d9beddcf6bbbf55b SHA512 4555d6f5edade7813fc1f36b7929221878447ef4224c96f978f5d36db262364bbe65b37c8bd0b844e10858055dddd7eb7d5840de00c32ef2b1fa219a741da1ba
-EBUILD tomcat-servlet-api-9.0.26.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
-EBUILD tomcat-servlet-api-9.0.27.ebuild 1001 BLAKE2B d3ed95575adb0ac164f17e721146bb7f8c2e23bbe424cba29a1d2bf4bb97185371a635c5d5d06f78f395f0a8fda33bd00a707e545c706b4c43c288fbce976a94 SHA512 24d54ded5e701697509b6044be4b6f24591ad8349ff36ac331e7628c26eed22f7ec29f0ee82587b5005acf566f01e23e6e219670dc5e1269a80ff5536bc33765
+EBUILD tomcat-servlet-api-8.5.47.ebuild 1005 BLAKE2B 029fadc44ace7749ca1c4db4178f2c15cff949455e76510f31be9693266d9ddf08cd674922703045e462925ba413450b5bb61c3168796b0f21cfc498c3954cb4 SHA512 6e4e625564a15b37795c7f13277e0f3750a8ebd94d9b733867b28806f9dfa066baa88803840f6b26c1ec0a12b00c5b5440ef43a9bd77177161f7134aded2b5b6
+EBUILD tomcat-servlet-api-8.5.49.ebuild 1008 BLAKE2B b0a72cde70dc747a59e3132f9e7137b9357e96246e3aff202fa2915f2bb8b605984861abfb2d6cbab144d829469b26644e8a996dca682d41d9beddcf6bbbf55b SHA512 4555d6f5edade7813fc1f36b7929221878447ef4224c96f978f5d36db262364bbe65b37c8bd0b844e10858055dddd7eb7d5840de00c32ef2b1fa219a741da1ba
+EBUILD tomcat-servlet-api-9.0.27.ebuild 1000 BLAKE2B b410d7f4731df2e4bf4a6662e0af2499abb8025cd151f7945c36d5866ab9582794a1fec9ba83efc2ffeadbdf1be947a6827e2a022922dcd44912cc16eb0162a6 SHA512 d70c5000a9122e187b45d755f08a4bb8b76f994c5dfdc12146f6c4cef0d7e70607636dac9a43e221d8f7b6e50f85b34f435d221a8c837014cb309a2c9a993ed4
+EBUILD tomcat-servlet-api-9.0.29.ebuild 1001 BLAKE2B d3ed95575adb0ac164f17e721146bb7f8c2e23bbe424cba29a1d2bf4bb97185371a635c5d5d06f78f395f0a8fda33bd00a707e545c706b4c43c288fbce976a94 SHA512 24d54ded5e701697509b6044be4b6f24591ad8349ff36ac331e7628c26eed22f7ec29f0ee82587b5005acf566f01e23e6e219670dc5e1269a80ff5536bc33765
 EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
index 3f5e286bd928..58e80d34a727 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
deleted file mode 100644
index b1a2ab2e5ecc..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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-8.5.47.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
index 328f44502237..22fb494a8525 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild
index 9b931baf0d49..328f44502237 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 JAVA_PKG_IUSE="source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -14,11 +14,11 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
 
 S="${WORKDIR}/${MY_P}/"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
index 75af8e3a7dff..2fcbc10f1d8f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild
index e35055493b79..75af8e3a7dff 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 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"
+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"