gentoo resync : 15.12.2019

4 files changed, 2 insertions, 38 deletions

diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 8ae38db72530..2f3fa86d82ae 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
 DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-log4j-1.10.5.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
-EBUILD ant-apache-log4j-1.10.7.ebuild 402 BLAKE2B fee10282ea30ac6388690cc3eaeb8ea9733ab61876dde82f7df0360ddfde8834cc171cc96d9719c3d866e42bbebb601c34b994d3208d06ef1924cd5a6837c28a SHA512 4e8f925df18cb13469b98c087d5f558efde24214e6a81dd7eb6c659ba7086eb7cb2807e80ef662cba48347885a116ec3b84f66afd6ad20bc5d863c80222bf8f8
-EBUILD ant-apache-log4j-1.9.13.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
+EBUILD ant-apache-log4j-1.10.7.ebuild 399 BLAKE2B 3e7eb53c82576e7473a4f803195ec2f6fad0202db7900ef15774e9adca9316a1f19d638f38390d9f3cb4181327b922e8e503370793e7337f99c1964e47629fa5 SHA512 c36300f7707ac4f6dc475f3dad47f920320495883c11b883e25b2dc4267a6063e07d9f09dc7a6bdeb706ac3c758122a32ca83b906472be4b7085df4250790dc2
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
deleted file mode 100644
index 0d18b22953c5..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
index 661919e8793d..b4660cdfcd66 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=dev-java/log4j-1.2.13-r2:0"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
deleted file mode 100644
index 0d18b22953c5..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"