gentoo resync : 25.11.2020

3 files changed, 2 insertions, 21 deletions

diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index cbf0a58d5131..2ba1082a6825 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
-DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-jai-1.10.8.ebuild 365 BLAKE2B 87332418de20a4b6208bd0d09a69b335cc67c3af1528ab059f580e27840c9bc12b4aed44cbf25b4037d7d14f3b3c1b22cd1881c775bd17c31b9daca2d373a590 SHA512 b405ebede92afd868c05b014d5e4494f598cca15418cae0893f677c4b2a110cc7f1a3819264952e241bfabfc9de0a6d5b0c2d454bb9539b98d11c000d378deb5
-EBUILD ant-jai-1.10.9.ebuild 368 BLAKE2B 3dd0bbfcfc9c9d03fb0b25019c9d52b45fad39c200814fb01255ba25e58dd0639f6ad0b40cd1dd7c7068c80098f63a79d99aa45b977c1cf357458e511223b1df SHA512 cb5304d7774e1601503628b0017bfbf85f354bfe11946f635d913550d2a79f0662dee5a2b69a87f01bfeb303c22c682d905db63bafa7f540635fb81f29203371
+EBUILD ant-jai-1.10.9.ebuild 365 BLAKE2B 87332418de20a4b6208bd0d09a69b335cc67c3af1528ab059f580e27840c9bc12b4aed44cbf25b4037d7d14f3b3c1b22cd1881c775bd17c31b9daca2d373a590 SHA512 b405ebede92afd868c05b014d5e4494f598cca15418cae0893f677c4b2a110cc7f1a3819264952e241bfabfc9de0a6d5b0c2d454bb9539b98d11c000d378deb5
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.10.8.ebuild b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
deleted file mode 100644
index 3a2873b650bb..000000000000
--- a/dev-java/ant-jai/ant-jai-1.10.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86"
-
-# Unmigrated, has textrels and there's also some source one now too.
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
index 944faa9eca69..3a2873b650bb 100644
--- a/dev-java/ant-jai/ant-jai-1.10.9.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Unmigrated, has textrels and there's also some source one now too.
 DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"