gentoo resync : 20.03.2022

3 files changed, 2 insertions, 21 deletions

diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 5a6fd0da69d8..36364d8dc858 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/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-javamail-1.10.9-r1.ebuild 511 BLAKE2B 7df30d50b3881fed6f85d3a4cb721f6076f17c65cbe85668efbe1460ebcec484b4d0e28f1b94c305a58446568ae3510702718805501c9e9bd4264906258cc34e SHA512 eb4a58ec4762aa1c99d3be44b9252eaf832e754dc5eade459de6f6c533ac86ebc46f7be899ac048d1aea0742f80ba6df7e11e00cd433f01e77844e2c44c16ed8
-EBUILD ant-javamail-1.10.9.ebuild 518 BLAKE2B 6f4246e708ddb2b3de9971dccca451957f90d4d3ef09214b782ed31e6375a3dabfa729a262abc4388a67d210b3c7657a45697722da9e99fa8e29b557de92f846 SHA512 8959fc1ef8b032140cef7ccb356a907b6a935a3811bc6ccb26781754520103652cd0b39e7077e3251bafaabd91d37280ff47265cc5ab71e83163363a917bbf24
+EBUILD ant-javamail-1.10.9-r1.ebuild 508 BLAKE2B 5ff3f8f4e795476d6a08a89b2391ad330c575f62c7357f2a31fcdd2ffc617ec66cd24beeeec59b1dfb95714aa66b51b10bc385bc6aa5bb8704558c7ba5f83b6f SHA512 1fb691049f12c3b5d463558941aba878c326c8b1cacd418f04043d9243dad8ee52a1ecc0d7179bbb39ba22f2b57c30b9e99a19eb1b4004828e77579b037931e1
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
index 4168b32358bc..b48933c6f765 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "javax-mail" )
 
 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"
 
 # needs some classes from javax.activation.* which are not in jdk 11
 DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
deleted file mode 100644
index 5619e69090d8..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
+++ /dev/null
@@ -1,18 +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=( "gnu-jaf-1" "oracle-javamail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
-	dev-java/gnu-jaf:1
-	dev-java/oracle-javamail:0"
-RDEPEND="${DEPEND}"