gentoo resync : 06.04.2022

3 files changed, 2 insertions, 18 deletions

diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index c16979e7e73a..d5ad7e6c71bf 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,5 +1,4 @@
 DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
 DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
-EBUILD ant-apache-log4j-1.10.9-r1.ebuild 395 BLAKE2B 0d68c72d4fa5a3f28bed9c87a513a8134ca75b4c0631e9f853e60ed9d94cbb9eddef7f291223f0ec7e9956add0bce78fa6322d11ac889f0a8410e0155f96d9cb SHA512 ea4d0f9a2f50029650930166303d1545ce91833b60c09c50c4aec8b4300b8437a34cc7db484b0b4250d87dacd6038159c141a6ded0f2fb09ddea94e47a093716
-EBUILD ant-apache-log4j-1.10.9.ebuild 388 BLAKE2B 4c25ff0efc34bff1fd224d7dea4fb3216b0a1f7c42796edbcdee9eb2bfbca95c441a52fee03dc381a5999905048f5092813db9b359e82ee8ff1423f30c0ad927 SHA512 a9925cb6bd56d0aeb25a398f3640d9867048b1555f9f7970f4294e8eee3cdb4ad0d1747ca4a1fde48346ddf51d1d6a58df8c02125554612cda6eddbd9966fe7c
+EBUILD ant-apache-log4j-1.10.9-r1.ebuild 392 BLAKE2B 1fa0ff853352fef1a6281a5af2745f4662e3f890b7a620ffc0b22be22f3e3b4cc299297cb8afc27fb415a99eace4b282e1fcf505580c45f8b8cb7d165f8f214e SHA512 8933d910b640fdff67621c61b3f79f9371315a37c50d6fcaf311e093c02ea2e033ca714547b0fd0f4df625bc48dea0d8dc873907df5118e3f8a756e83788eaaf
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
index 89617f7176fe..c48b772e49be 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j-12-api-2"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/log4j-12-api:2"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
deleted file mode 100644
index d30b5fb9410a..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 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="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"