gentoo resync : 18.12.2020

10 files changed, 9 insertions, 111 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c54422da7570..c7ec6b6a7cf2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
index 11cf4484d97a..222a96aa1a10 100644
--- a/dev-java/dnsjava/Manifest
+++ b/dev-java/dnsjava/Manifest
@@ -1,8 +1,4 @@
 AUX 2.1.6-no-network-tests.patch 1354 BLAKE2B 3990543ea76ae8c2a485b6444e75ceff4abcb7eebb400eabb04b9ccd21560649478a54586c65bd97a4372c2d861d2f2064f2de6e2b3cb48dbdfde0864dd76d58 SHA512 3170ab2f64fdddff5fba26d32b0ce43f08fbef333e14ad1e1b7490e0227cd549febac4506ac5536d96f7f9316ea92d333fb5aee2f82131f90a922e52571ec1d0
-DIST dnsjava-2.1.6.tar.gz 1087908 BLAKE2B af9edda95d8cdd9c02b39c5a86646efc85cef576361d4ab765ce65d8b6e20621bcbdc9e32327f8ae1a3e2cbb83e60d61736ce9d71ae3bd091b0fca306727e158 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497
-DIST dnsjava-2.1.7.tar.gz 1078980 BLAKE2B 16fd027c6f46463d6b4322bcf88943a3f06186d853a7e5615b8829d93aee897dca489dec00d61af857d58df566905c559e1c8d9922f5592ef2146bc715dc9b0b SHA512 07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd
 DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1 SHA512 d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b
-EBUILD dnsjava-2.1.6.ebuild 962 BLAKE2B b3f8dc3e517a85315ffc3404ad6123fd60ed6e750474f75562e6a3e33ef9c993aea97407e6c0c6d839f1e2361c59cfca26e97c969479ada26247a9fac4ee8729 SHA512 84d11811efab0a1cc1a1427b9d8118c7ed62ecfcb22c597cb724367c88d8fd7a0c9b520a787aa9416a725a6aa5045f0e23801daba959c4e3ff40c178a12ad984
-EBUILD dnsjava-2.1.7.ebuild 940 BLAKE2B 5d11ec37e36d0f109c09c72623eed086469b11600e6007e4e41a5222fd96f0574cc9f64d002d56ed33052f5e864fbdebba5a5691de159d9ecfe13f1758c048d2 SHA512 f6b7ef4507569a06de4e8813fb57c8881895cebaea134b30802acc4e6daceba308c077c14dfa902a3a569080f96e2eba213f46089dca6786317d4614bb9c5e06
-EBUILD dnsjava-2.1.8.ebuild 942 BLAKE2B df32d1809a30995c6f62f072067116b67fcc86ea66d4ea6dc2bbf19d863d4d86a34ebce376aa25b0a5e42829a40f23bbb3c1be2f72277369419170d747d9a87d SHA512 f464b14249068bcb52b3724bd74f4fbb525381af4428d93552993f114988ddbbb7d7e3e451dcfb7514441dd8efa9abe7fd76ce9d7118313fd13b72dc4624bf20
+EBUILD dnsjava-2.1.8.ebuild 941 BLAKE2B b2e2962b8e1e29d3bccab5a1f6741986601f7e67b1cd82bb42e1c40f8d36cdf2daf186d730782f82e0b071d8686ba362fd020e7191b05f6c0cb3a1d6525910c1 SHA512 b474e9e3f840f60c4188ba3792360e1e61a5bc195c38c573c57a9ba7de02fb6fd011708ac41a440f54747b08c769a927fd106fc2e66ff3d83ed760b8cdbc5151
 MISC metadata.xml 765 BLAKE2B 106c05f7c8b1f594e668610ed2e244c395868461cb3cb9908c3956861388a5f37c62363b008c9c1e626b0b191914fe2fa0a03fa8d99dacc4bb7253f9a12b6a74 SHA512 800c2681a0c1fcdfa661d1c1ad996367f88f725e32dac8994b24b3ebd51dad3544c70ddfb009561f7987780cb4237809de3fd58bb642fdd8e1bcd20e239cfdda
diff --git a/dev-java/dnsjava/dnsjava-2.1.6.ebuild b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
deleted file mode 100644
index c45f80d04cab..000000000000
--- a/dev-java/dnsjava/dnsjava-2.1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of DNS in Java"
-HOMEPAGE="http://www.dnsjava.org/"
-SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-		test? (
-			dev-java/junit:0
-			dev-java/ant-junit:0
-		)"
-
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="run_tests"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit"
-EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-	epatch "${FILESDIR}"/${PV}-*.patch
-}
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-
-	dodoc README USAGE
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc org/
-}
-
-src_test() {
-	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
diff --git a/dev-java/dnsjava/dnsjava-2.1.7.ebuild b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
deleted file mode 100644
index a7d0260b9eba..000000000000
--- a/dev-java/dnsjava/dnsjava-2.1.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An implementation of DNS in Java"
-HOMEPAGE="http://www.dnsjava.org/"
-SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-		test? (
-			dev-java/junit:0
-			dev-java/ant-junit:0
-		)"
-
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="run_tests"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit"
-EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
-
-java_prepare() {
-	java-pkg_clean
-	#epatch "${FILESDIR}"/*.patch
-}
-
-src_install() {
-	java-pkg_newjar "${P}.jar"
-
-	dodoc README USAGE
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc org/
-}
-
-src_test() {
-	EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
diff --git a/dev-java/dnsjava/dnsjava-2.1.8.ebuild b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
index 23356a60dda6..7b127612cd30 100644
--- a/dev-java/dnsjava/dnsjava-2.1.8.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 361c6f3a2a7f..eb4e46c29092 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.3.1.ebuild 979 BLAKE2B 2029c0220fb368462a057f3b6f6fc68e7d8754b7f3d9a49af6e70c8c213af4ab63d546cae822b0df2e1e15745b9a032591fb999c93e1cc7f4fe3177ad41eed4a SHA512 6e1ea605acf67757d27f31a9c14771d3f7d3f71705f0c70eb32291cd87d4719d1cc7c854035118b11fef6f2c7ad28834fc7a2996bb68987cbfe754dae5bd0510
-EBUILD java-config-9999.ebuild 1104 BLAKE2B 830f732cd34402a73b926f689e7e2812b6653eba77e9a8989c89f62a56a36e517132072b1c3f8f2afef1dd48926b0449b2d6ac14d5efd4345ec20d005823e033 SHA512 ddfa3421ff2c657f49e1d5db449988e0a1156de2e232521193bc139f86852557ae91b40e8233fd253a6f758f996cec60d5a9746b1fe31193bf64e00ed7c6299a
+EBUILD java-config-2.3.1.ebuild 1094 BLAKE2B cecebc371ca2d2e74dc51f7f93a2af103793c0e99b2e04c530dfa048dfcfde2660ec784b7668306a8640acc4b6a055f7c0105b8e63aac9402a3199488710f639 SHA512 aebcaedecfbde203d4ca857f4dc3f1848553f91fa404059c2a63d6266a02b3968b63b1dc364576807c2f3ec92d67296000136dbc7fa5ea2a629a408f87dc06d1
+EBUILD java-config-9999.ebuild 1219 BLAKE2B 8661e165198b6a62744808cb0ce24b2e01ad43841519eba6dabb456da0132b711f153551c06abbab36de4f0d52c3e009a3e7679a780a6d692ce544f73000805f SHA512 2b3ceab1c45194c994887a27d7fceac6e039518d67c702954cf9465de088681f784a05bbd30e2871d19032a0937732c987fe0e8cd6d74501a960029f7a2c9064
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 51075d6fd153..dc9ffcad70ce 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index e60c556878bf..5d6a98ef9770 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -14,7 +14,7 @@ if [[ $PV = *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index b81756c1de7c..e56b818ec69e 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,5 +1,5 @@
 DIST javatoolkit-0.6.3.tar.bz2 26071 BLAKE2B 50adb0871e814ad1716fedec1e1429b1da69349ea502139bed75c175a89142e1f10abbecfb434875eda46e21c86ae49d273beeb5aaddd10a903ffe153a1adc4b SHA512 b4e57d26e30455587c7bc8273420c3300c1a776f3321d8ed36638f6aae41c13ba785b37650be5577908e24aa2bf4fa4e11d3157211dc64b6e3c814c4df3b7d6a
-DIST javatoolkit-0.6.4.tar.bz2 24363 BLAKE2B a740bf92dfab4250033e71075d5ddfce1f049c225e05197eb5169189e4bb95982b3c4c64dd676f8a1478c1df13bfab4d16cbd822b4aa8472ab8aa7af8c7f80ff SHA512 e1d45b7f754680887296a7b3770fd371d91738f8e9b806dc37b6559a317ddb9646b113a9dd8715f7d5f2b19813d9a936ae4ca2d867fc6e0bfc3f131977ba2674
+DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
 EBUILD javatoolkit-0.6.3.ebuild 828 BLAKE2B b8284438bba4f9539b4435d98ca0aa83676f6a51ba5ea6efbfcc061990b128de0997f061f2efb0f3724729cc1079878c688f6cfa6b0159c519d5139ece1aa1a7 SHA512 a8f2167aac2ce4d33be6906250ed3e02bf2ec3a03cf28c4b6946289176581741d95c1836da783fdac9b90598e3e4552cd13b038660d8683e4e1b53d191fab0e1
-EBUILD javatoolkit-0.6.4.ebuild 835 BLAKE2B 5ea4e9da5188d8732efd7b2083f9602fc3819582ceabd8d9a73b2f166c8e26808fa0a5b7232a42d70b0be1a4d2ec46e166d4c0ab619e06252ad7c7cecacd2524 SHA512 a2ddb04978fb8b49aac4eaafe43293c4aded094d20389694c2f5a07a379b7abf83122b33ecfeb8570b8a6c96f18de02bfed5f04e1a3ba2850081c778fcdaf85e
+EBUILD javatoolkit-0.6.5.ebuild 834 BLAKE2B e95e1f42e9a4c1ad556e73b522265bafbb440a47d9882b3f0a429ec0a9ab59e392f0b0306e7e93481c526f36b5e78f29880cb35137c907fad16dadf956d96083 SHA512 dfca38edcba0e85a5c63d844434308e26790eae8eccf2acc5f863e49e1a572481627495b744b223f5716c0eed5c2044ea943c269f76fa581390165ede081333c
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
index ce3df6ba5a07..439e723f3148 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_prepare_all() {
 	hprefixify src/py/buildparser src/py/findclass setup.py