gentoo resync : 22.01.2021

9 files changed, 13 insertions, 58 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 754234bc0704..e549ac86b323 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 77052d537a99..958add0d4b89 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,3 @@
 DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
-EBUILD gradle-bin-6.3.ebuild 997 BLAKE2B 14539daf17d39d17d539561cb6d6d4ab586f3e8a6a084d3684b8b1f8bdfb160bdd3f7c3091ce0f362c93c3ba5b3c0d3641aa3e6fab1ea58338f3973c7fb0270a SHA512 7bedadebec8b2df5bc94cd2b674965edd5529fb4cf9eca8328c117cde83bcfa2baf96eda3ea8ec4b75ccbdec3e504b84d54d1861dec69586f781a6508e121a5b
+EBUILD gradle-bin-6.3.ebuild 985 BLAKE2B 5108b1a0ec969d79b2a27256b8c9ba5430f4d4326bd0e692cebeb31c9f09830592c3b856b19376fc6eef2d14069bf3c804b11f8054e7464a5a88c2b6b81cfd58 SHA512 c04c5d989701292ee4cd269e61ba989b5dfb818822b8c92f274c808216fadea75014ca21359ccdc859f29cc62812f3bc45c4a6db71a0f800f25575587373b583
 MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
index 93eb5b8f352f..1623bb9c3f34 100644
--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,14 +26,14 @@ RDEPEND=">=virtual/jdk-1.8"
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
 
 	insinto "${gradle_dir}"
 	doins -r lib/
 
 	exeinto "${gradle_dir}"/bin
 	doexe bin/${MY_PN}
-	dosym "../${gradle_dir##*/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+	dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
 
 	docinto html
 	dodoc -r docs/release-notes.html
diff --git a/dev-java/jacoco/Manifest b/dev-java/jacoco/Manifest
index db0d18793d7c..63572209afa1 100644
--- a/dev-java/jacoco/Manifest
+++ b/dev-java/jacoco/Manifest
@@ -1,11 +1,6 @@
-DIST jacoco-0.7.5-agent.jar 4078 BLAKE2B ca2f7a06f69ad682ab69baf959367c45fae4e1d5d32936a83bc631e9cf53945871c88db7954e2c5ebfe3266c1f2e703887dd03ba2282f308f04b645c3b903ec9 SHA512 bb374677679bb00de2029a0247af0117393bf691b1ad54f43756e6a17dfb5745f90a3c4d6470278f56e6dfde24e54e45663938d037cd3aeb0d24780b17575e56
-DIST jacoco-0.7.5-ant.jar 18060 BLAKE2B c7a04d127b2a65b5661f54786e51a2ec81589cbaecf54e02a804ed262fd4e857a51a269ef1728d81418c86e1897e54674eb3dc73ec735e84502848cdf5fe691a SHA512 1404727c1ebd9af8f6be47e0b7dc0b717a8f235a10e0fcb9d0472b8286a6a0c719877947cefe472fecdf2388b46810668650fed5567038310cec37f7f11c04c6
-DIST jacoco-0.7.5-core.jar 111749 BLAKE2B 96321d0c51aee10b71ca9c29bd22947c7befecdff42619d3eebe1b2a99eb4f2aa96062468e014ed53e956312751abdd1d7a253e3bc47ea87d55d957aee9fdea0 SHA512 7dfb16ff621b8eca76cfaeb468f9448b7c1f2bf2cffd324a5069822a03d6b70a7b9e63a08f78dc0bad7c6854e8b1059f36095a01e155f1767da6ca88913c3989
-DIST jacoco-0.7.5-report.jar 112315 BLAKE2B 88ed31eef647742c2a4b114c83aac7f31de68ffd854e0140f9d2775d2ffc9791245da54a839978b28423c887b00b39cf4680cee056f21356a353034a0858a67f SHA512 3347130757022da94b41a6b0d001d8b59e000630834de7972248ce53b447f28aeaf902226acf2485e8afbd797b84af00fdd1ea2c6f24d93ec60407e229f8a796
 DIST jacoco-0.7.9-agent.jar 4078 BLAKE2B 40d44cbbaecdd4613abed5c065c2ee320208fb1bc7e8b0a5b1e65f2ce59424967c49ee3c286ab59adc504efd2f8dac0a08c2716b400b9dae63ce5cb583a4ac1c SHA512 b0dc423039bd03bbccb62667c5dd6e2838bf75a8d98b0bb5eb51c6ebfbe3fbc6cdda86ac9e15cd2e06165202d40ddfdcc5a8553681d78026fc766ebe2f81f17e
 DIST jacoco-0.7.9-ant.jar 18096 BLAKE2B 08b5831a0321ee5620d71fbdb397bb1854c1fbd8d3d134ef8b924c67d4aff21c84875df8c2e6ec16d4a658a79ebeeb6af0ab5d653bfa87498221c38d163ce681 SHA512 8238cf2ee6233199280eaa271db8a189c33c9bef3508a7bdffc9363e6afaba90ed38d9d53eb2a88ddc3b214f1f25d7f872d6109942de7a8987e84392fb958f72
 DIST jacoco-0.7.9-core.jar 117366 BLAKE2B 2c0278cc688a26f429d78066d76148ac94b2af8bcad4631666a53b4977f136c9379e8fcc817dfede088f3df0b179220eb8d9d915d599b0a076edc0d9e86a2638 SHA512 7ac184a92aa0054eb44bfadd54c42de238da6193e9536b26fe67c2d4b65398e9ed7c471daa69a98d7138fc0ee5035a8ef40731e45363435cd30df959eb80e5f6
 DIST jacoco-0.7.9-report.jar 112521 BLAKE2B 9faaf71d98b4b0ee19f78785218de47f2a5ac52bfddf80256ff00ef3786177a3f37e53aa75dd8d373a247019a3a989532eb1a5337f7af4006e2d4133c3a834c4 SHA512 128b254767d627a185e5794b3c0ea479628e2eba05a4188c613c4661da99f3330d4491640860a0ce33fe2663ff7c218772d09dc22237c00f78f60f6b9dcc0990
-EBUILD jacoco-0.7.5.ebuild 1071 BLAKE2B a4f038760d5c0e9118a7c37ccd6f067894dbe0495fe871bb86e76016454153dfa6b7aae20c242c3744ec1ead41d3ca59a53731a144b01849ff7efa706f332130 SHA512 2a92294479b4d60ea71fd8f77cc0bfa6d3f128f635e9ff65b690683b3fce1b617b0ad31a9efcb8ab9acd307dffa880169c18adad3b7bed0c480d36e3351defd0
-EBUILD jacoco-0.7.9.ebuild 966 BLAKE2B a61994796ac232d7c576a267d4e469ef07ef84943d3c0f3906625982297827f6ff3bff5f1456cc20265744724e83c8e53a832178ea499bc426e235501535e1a7 SHA512 dfd92e0c5731f1ad906e78c58299bf4875de0a2c45bd3f095b4ee4a68eab4953ccfaa80b590f69bc8bea3ca1f44609d414f2a1e2e13e2d474df954d94431943f
+EBUILD jacoco-0.7.9.ebuild 960 BLAKE2B 38f33ebcd2479728dcd5fe738a8756426759953f344a14595081f80660b0c17c7fbbb61485d019151ee7e04e8377260ef74e61626b18024a5a0da7bb0afd9f50 SHA512 e28c66edcaf28f0c840b6a32f04243e12eeb3770931a1f20e54aaa9dd83cfbc99d99509bbda466d11ce070052842a0f500022a08682e22b2aa51043abe9d7b65
 MISC metadata.xml 325 BLAKE2B 7ebc2e3092ef5e2b25c1595945fe58586c4b0b5f5861e1067ff13aecee628bebb958c2f5856ae9d92652417a42abca8383ba7168069c8367a9cfc1d68cdd3bd9 SHA512 0c1d295350f6e39939497eb52d79cd0ddc917c417600170d725ea49405f2c5c4378f86798b9b1fa421f6e0d06055abd68bad27ff104fa05b5cf179415ef2f536
diff --git a/dev-java/jacoco/jacoco-0.7.5.ebuild b/dev-java/jacoco/jacoco-0.7.5.ebuild
deleted file mode 100644
index 01911e7ac908..000000000000
--- a/dev-java/jacoco/jacoco-0.7.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DATE="201505241946"
-
-DESCRIPTION="Java Code Coverage library."
-HOMEPAGE="https://eclemma.org/jacoco/"
-SRC_URI="
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.report/${PV}.${DATE}/org.${PN}.report-${PV}.${DATE}-sources.jar -> ${P}-report.jar
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.agent/${PV}.${DATE}/org.${PN}.agent-${PV}.${DATE}-sources.jar -> ${P}-agent.jar
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.core/${PV}.${DATE}/org.${PN}.core-${PV}.${DATE}-sources.jar -> ${P}-core.jar
-	https://repo1.maven.org/maven2/org/${PN}/org.${PN}.ant/${PV}.${DATE}/org.${PN}.ant-${PV}.${DATE}-sources.jar -> ${P}-ant.jar"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/asm:4"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	asm-4
-	ant-core
-"
diff --git a/dev-java/jacoco/jacoco-0.7.9.ebuild b/dev-java/jacoco/jacoco-0.7.9.ebuild
index 34d19717a0af..14007c228165 100644
--- a/dev-java/jacoco/jacoco-0.7.9.ebuild
+++ b/dev-java/jacoco/jacoco-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CDEPEND="
 	dev-java/ant-core:0
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index adc9e0c693e4..3755f7ef207a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -18,7 +18,7 @@ EBUILD tomcat-servlet-api-5.5.36.ebuild 1426 BLAKE2B 02098b91f21bde7a24d0cf38bb2
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.107.ebuild 2994 BLAKE2B 4e8f86d3f068f2e1dd1029ba8fa6d7df7b628a26ed5366d940b20d5375070d09caf2efd3429e8784fd1777d771a107a9184d7a46113966a994e4c496106bf37e SHA512 dde6491804e3f3ecae22d42fc35f40e64d867af0962fa0f9f4e91eedeb4df973175b3eccd45e59ed00eb3e7ec676326861540da6a8176e8275bbd6abfd8da6eb
 EBUILD tomcat-servlet-api-8.5.60.ebuild 3006 BLAKE2B 7608f3ce7ecb52570528e05e040ec079b76970fd4dc408e481842d005bbcd292b5db0a45985b3833d3f2129ec8e69792d225b6bbac2f474e9221ffb38af4667b SHA512 e21868d016e2ce116be08ed06827f59da07dc3bf4ca0f0ffd29369c3b8865ee3c73ff0aeced838cab3cbc7defabdb637ae13ff77f083de8bb1f46f7da4e16539
-EBUILD tomcat-servlet-api-8.5.61.ebuild 3009 BLAKE2B 73382c67d346ac48e0a3cc8fc35fd48be7c2a9bfe8fc9b18da0dec532f0d131875dd169916eea4f32aa82005e025c5b1073d6cdb3da25b9886b9687287cb7284 SHA512 e085c0821b6635da8c3201c472d883d40900828780f0ab8143c17c87c86d837a9602da05e0574a2af3fca268a3bf73de71be2ed5f6798c59aea3b97497220c60
+EBUILD tomcat-servlet-api-8.5.61.ebuild 3007 BLAKE2B 081ed70f1ed5aecfb0b1ee103a58a1d1b3f51b275a82d13b56212d1ac097c5c9170c75ca855ef9e5c202d5861614f90827b3933becd0e4a7e4493176b391090c SHA512 950f61e427bbb65c5abfa9ab660943a2453697edf9282bd0ac4d795e188b2fb842b89add347d6299ef18714182c55a3bd8270e61a606ae43332606ec6dc6c6f0
 EBUILD tomcat-servlet-api-9.0.40.ebuild 3172 BLAKE2B 6c853abc08b2448a4f6cb507968a4d06c8c952f631b142ac50f72443c55a3a27fd44c347b987a6beee703fd13e1922de9d4da20920c4d4a34f06598d8daa6bb2 SHA512 e3ecd5cffcaef886fee3bfcc7f11d54258c3e2642d8e2b4328ce9b60089dd4992c4bc4ff137eec99f3d2f8a74e72115e50541486268f4cedfa8962eaf491250e
-EBUILD tomcat-servlet-api-9.0.41.ebuild 3174 BLAKE2B 51d67f7713bc5179e3a3e317b5c1ab47c8e1e7f1f733a560bdf495f07951d2d19bae34141b0f49e637aca382d4e6f4d0ef9d7fe587f4423cd862d7c5a00f5572 SHA512 5066130bf7306e0f70877b8d6438b1fe1b1ccc1dd3630b4fbc4e1dfac070001f213d28ade37c982b25cdc292f6a0d8a4bc5b354236e64873559fccce0c98c1e0
+EBUILD tomcat-servlet-api-9.0.41.ebuild 3172 BLAKE2B 28700a17edaf81fa47d08083fa506c89cc81a876dd4cc29310bba7487454317c271bef7641c0fc93f99b9a53155c2d99c4ebfa90c5f73d2e0188b75211f46625 SHA512 11cf7359592cf2ff2e2ff453fb90f649f6c9f2e444c5e58dfb84808256f13557be9dfadb188669fae88856af6aca9ecd242d043f9d43f96574715c35db9ef17f
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild
index ffa23dfbfdf6..9500eade01ad 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~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-9.0.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.41.ebuild
index 03de50ee0b26..f26d8de4e6b2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.41.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"