gentoo resync : 18.12.2020

4 files changed, 2 insertions, 104 deletions

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"