gentoo resync : 19.04.2018

12 files changed, 8 insertions, 103 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7e20377532d2..3d00ec59825b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index ef9362108cf9..9159789036de 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,3 +1,3 @@
-EBUILD ant-1.9.2-r1.ebuild 2029 BLAKE2B 7af5e2d5b8eacccb9d973339a2339ecc7ae2487f4e4efea060e15b84ba0b28da3ac1a41c7239aa46402c7dc5f73faa28114f0cb1cf2d5f00972377aa41059b9a SHA512 55265f062ea8ab091a3225c315cba3bae142106198d98b10d4e2c0d044fb20fc64c22619277338cad4e08bc5697fb467216a1c23b6f8d46b6db9a6fbcc32dc3f
+EBUILD ant-1.9.2-r1.ebuild 2028 BLAKE2B ca5764f9f61119fc968637f2b3b42b4d0d2240e6731c2604e73cd803504bb1f3d330c4d309f79af9a8ea256d1299fc904c97d2558d22630dc03ba10f84476cf1 SHA512 126961c5dc6ff0119303cb4de1dcb689468aa00b660930148849335a660e82649b46f024373f0681b3a4a2f123953e2c082f68136f9a97cebd4d05d90078d74c
 EBUILD ant-1.9.2.ebuild 2102 BLAKE2B e024fddb5059511959821e2a1b56e5da26ac1a9d07708cc70ffb0425118294c7418d59d362ed56ebfb61166c8315f8f81006148a99beb2d5611e9e5f95dddab2 SHA512 e384f395421d69568246bdb370d7b3e40a06f4d96c727a090ce64997b20fec585680e36176507c132b74b44716d72559a781d8acb71c86dc749deafe48785bb9
 MISC metadata.xml 1159 BLAKE2B 393c61676e20af2acd08d2ecee954ea68ddb794f3aaf52bb576f72049b8807b25b8122919254d41cc249c88b375283d459193fe2c05dda46ae344e6774674ca2 SHA512 daa64360ccca2ae691a7d47b980cc35eb0c4577fd99493b235c4931861edc60a0bce1c7da5d360fd58c3c426421a7bbf41a8d9b463783e212dbae91f32a06a49
diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
index 9d4439ac9ad9..ae59a0f51382 100644
--- a/dev-java/ant/ant-1.9.2-r1.ebuild
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
 	+jsch +log4j +oro +regexp +resolver testutil"
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
deleted file mode 100644
index 628772dc59d4..000000000000
--- a/dev-java/commons-betwixt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX commons-betwixt-0.8-test-dtd.patch 549 BLAKE2B 9269ee96e93be11b1425946e60c2010aae2c8ecce260b9c32bbac11f8252360380d2becf13a3f243c0165d7e0961abfe5dbb3cd936b3acdd0d7d2d9342d0c090 SHA512 06c2fecec6eb2efea02d29b88c5e38e8f43ebc5efa36fee009122c09ee8e40c08b3ecc28aeacd82b7c464bdf4eccc834b5233d0ef81228c96b4053610e1a92a6
-DIST commons-betwixt-0.8-src.tar.gz 359821 BLAKE2B 34540ee74b099494412dc631398f0b94f54d2096e3dbd0219a0acaa82ad4e3ae8bfa884704f7a468c6ed3c41745cadfbaf0020dca351fe04492ef2f3627be84b SHA512 9d82807b13b7c0dfedf2def35c80bd7467cafbec1a3a5a4e188d56ed4940c43238c12fd7f334ce0a3ff990c60af4cf94ba42adbcb7bbb21a2775ed7762fb0668
-EBUILD commons-betwixt-0.8.ebuild 1211 BLAKE2B 7d428a56c6261cd4134d8d55bdf681f3a6ca94e8b45fe061de2f02c30e5fa206a9747ba7a17c10b8026905490c13abdbf3e8358e4af31219a0cc457c47ad3de8 SHA512 56e3ee65a8ea528ad833febea8739cff1f2d8de42a45c48543f552b68dbba2c208d42b29fc367decffc01e9567cd70503f2c06753df85507e6290c8165e1b971
-MISC metadata.xml 812 BLAKE2B dea3c1b2e90fb3aba7b4534c97e287b8de96bc87980c268206a2d06967d219fd3791e56f376555b95a9c244078e38a17232a7ff7346ddc8dabfc57d1a677ad89 SHA512 fbb60c63fae3f556a56dae1e4499028c2feae633808e332a5c1ef7344d34bff3aa70a1717009c80e9a05ee24e7f1d3de1791035d117110fdb268e14c3c2a2af6
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
deleted file mode 100644
index e854dc31be19..000000000000
--- a/dev-java/commons-betwixt/commons-betwixt-0.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="doc test source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="Introspective Bean to XML mapper"
-
-LICENSE="Apache-2.0"
-SLOT="0.7"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/commons-collections:0
-	>=dev-java/commons-logging-1.0.2:0
-	dev-java/commons-beanutils:1.7
-	>=dev-java/commons-digester-1.6:0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/xerces-2.7:2
-	)"
-
-S="${WORKDIR}/${P}-src/"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-digester,commons-logging"
-EANT_BUILD_TARGET="init jar"
-
-java_prepare() {
-	epatch "${FILESDIR}/${PN}-0.8-test-dtd.patch"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},xerces-2"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${PN}*.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt README.txt || die
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch b/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch
deleted file mode 100644
index 221874bd4995..000000000000
--- a/dev-java/commons-betwixt/files/commons-betwixt-0.8-test-dtd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- commons-betwixt-0.8-src/src/test/org/apache/commons/betwixt/rss-example.xml 2006-12-21 23:14:19.000000000 +0100
-+++ commons-betwixt-0.8-src/src/test/org/apache/commons/betwixt/rss-example.xml.new     2010-01-11 21:48:59.000000000 +0100
-@@ -15,10 +15,12 @@
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-+
-+<!--
- <!DOCTYPE rss PUBLIC
-  "-//Netscape Communications//DTD RSS 0.91//EN"
-  "http://my.netscape.com/publish/formats/rss-0.91.dtd">
--
-+-->
- <rss version="0.91">
-
-   <channel>
diff --git a/dev-java/commons-betwixt/metadata.xml b/dev-java/commons-betwixt/metadata.xml
deleted file mode 100644
index cc177a3f7e6a..000000000000
--- a/dev-java/commons-betwixt/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
-	The Betwixt library provides an XML introspection mechanism for mapping
-	beans to XML in a flexible way. It is implemented using an XMLIntrospector
-	and XMLBeanInfo classes which are similar to the standard Introspector and
-	BeanInfo from the Java Beans specification.
-
-	Betwixt provides a way of turning beans into XML as well as automatically
-	generating digester rules in a way that can be customized on a per type
-	manner in the same way that the BeanInfo mechanism can be used to customize
-	the default introspection on a java object.
-</longdescription>
-
-</pkgmetadata>
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 0c968aab2e5e..f29db909d031 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -5,7 +5,7 @@ DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40a
 EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab5f37891834b587db8069c32bc41ac2d8f75a7c63f26a4eb80929a3fe9b6310ba3577bad32cf505809971cbd568 SHA512 abcbbadabe7dd9dccd2fa59c8888b6871e0104d803139a53549341f2a691975de2a3e9092c7dd4c2738dd89038fa154fd32dc91c293a8373bd012408bf2d1d69
 EBUILD lucene-2.4.1-r2.ebuild 1804 BLAKE2B 09b9ec3959dce0cd93fe8db4f091c4734c61bad7efb0717db0816a357945f310c866d732054920f86755a63849b500d0739f8c7f3f804a3b90d3244baccd560f SHA512 c8558fe7bb43e2bbe40daca7a05fbe5de006ab8aa8eac810e1528a12b5de84e030dbdf724382cfd6667a0c8c456e9b86ff66e8cfa15f5efc9a7a3cb8a6b84e35
 EBUILD lucene-3.5.0-r1.ebuild 3514 BLAKE2B 4e944c04e995278521268166d300e292c21b477969505de26f56d2450c2461e2fe76040d52ab81218176ac52a1104de7de37f7f05e942975789710b5304e2b08 SHA512 c1cd0378af15f5c555cbb9459415552e10861738107a321b3023ce57b569b8733d6779cdb87bcc75ff1f2f526f8cc87a74aab8402fbc3d2ffdedab5a93c805db
-EBUILD lucene-3.5.0-r2.ebuild 3514 BLAKE2B 08d936f48b45430c56c4c3485affce07c208ac6d204de1be7d6cdf24423dc0473af6553075266ab678f9e55204723950cc386c09636995fe17d72316cfbd048a SHA512 02d58b267125d3fd0e5ea0d2e7acdd691b8e40d0b180c21200797234a5d7485d72a72a12eed7ec0963ca7862505efb1c520845711e44dac348a7acc260ebd286
+EBUILD lucene-3.5.0-r2.ebuild 3513 BLAKE2B 3ea6625ecccbe40f891cac43caf2551c68f9736d6ea9c42bdf583a2e222ba8e4a55ba01f56b2749b87745c64bfed1bcff8395b51239e62763c166ff472177ac9 SHA512 1fdfc456521cab5d8c8c28f7553997968bb030682496fa8f46bc095446341cea2bb5361ea44cbcb901c575fe35d7635f9643cd8baab414532ed9ea30efa393df
 EBUILD lucene-3.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
-EBUILD lucene-3.6.2-r2.ebuild 5555 BLAKE2B 14ba002faa12b7d11e2575bb7a76aacbf826499ef4be171ff0674e85f22ba9abe88184ed850572cc5a3dfd980f8191d85f6ce1c8ebd6510d21de193307ffb7b1 SHA512 082aa5ecf6a13d4e4b887be80b579372fe1a0e8a2784a20f56f223f62b1cf63c8b7a6b03d30f8827507f98b75f72d9943abf3642b9bcb5bd7feae170c0b60021
+EBUILD lucene-3.6.2-r2.ebuild 5554 BLAKE2B e3f2d8ed61f3f028ae1eeb60045cb60e9e8910a6b1f2a4f589b961b02265f97b95f08d0b75f35a848f7ac599fb8c0600cb230fd2b3dea997d4ac2b6c069ecd88 SHA512 2b24e24c308fb1b43b58f7d77deccfed49d69cc0d3b94b84228c788213d803fe908f6ada388f568f6a88733de95b224d0468a559d71d4e90fab11372139b7734
 MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
index 9eaf6f89d189..a5b2c1d755bf 100644
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="3.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="
 	dev-java/junit:4
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
index 6ff6151e9bb8..00ad0d23efec 100644
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="
 	dev-java/ant-ivy:2
diff --git a/dev-java/tapestry/Manifest b/dev-java/tapestry/Manifest
index 33f2faab49e3..a607b1bb1eb3 100644
--- a/dev-java/tapestry/Manifest
+++ b/dev-java/tapestry/Manifest
@@ -3,5 +3,5 @@ AUX build.properties 1141 BLAKE2B 02c5b606d35bf1e94b147f04da4f6c626276fd85e86345
 AUX common.properties 2850 BLAKE2B e1745cd8c7cc162f3c8d8d797b88ecbc1fa4e35831d581639fbab512c31311793f8beee3f147c267d675e0960f0a753c3f5e74230f825551973d58c9367b0623 SHA512 a00b28fde7e90100c017238150fd7c830cacc4bc6a24e7a9bd90fbd32bd6bf8a3787a8a178f6ed78033621a47503b1517e9485ffc60d5ffbfe5752254713283b
 DIST Tapestry-3.0.4-src.zip 1174780 BLAKE2B 2f2ad5e3860ed6852962b282431df15ae4f6f17f0d08e4246dcef69bcdd033acafe881ea3ba33bd38c2dcf8843caf37fb0b46da84c5b107c2d1c4a0d77aaf89a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10
 EBUILD tapestry-3.0.4-r2.ebuild 1659 BLAKE2B e1776a2e35e394ebae18a34eb246f14433e16aeb6adee63d54904c6abd674aee10cd5f506c00455ddda2c0b8dfec86b8780dd89295cee157cd3a30988aefede2 SHA512 34c5834afda5d462ed8d39d7f6309fec21e8f6c1038bb633e02832ff9d353f933e829f723732f7536a911ca5134d4684f4ce493e115758b956e50aba1d4d6317
-EBUILD tapestry-3.0.4-r3.ebuild 1685 BLAKE2B 8d2d3d95629e1df0207e25bb3e0882675cb8c3643f6e0935cbf6a5a7dfc357028a5dfab10c769d015baa7f8a1299ecd6459b033e47df1353e13538eb0c482ced SHA512 d7207190024c90cde811dc19ce8ef6d0f0c05102923852ae91d2ac00b0d1f1867e9021a46274978d0c2268e73952695e88c8d41698ec5ac6f0e0a26058d7ae75
+EBUILD tapestry-3.0.4-r3.ebuild 1684 BLAKE2B 39c69889882d01bbbce5197c4d4599b5f33b48af073b408d6021f3f6d8de04888b9d72bf9edf9e6436830f110ec1013369af9fb0317df320c13a0c1f1be447f8 SHA512 18c88cf1c86c4891e3b53214db36afa6a3483f93b92a726c66c6eca08b1d9ed1e377c6119292499c3a8a36df4df528d32ae5bc353f8bc0061d49f40d8ab546da
 MISC metadata.xml 750 BLAKE2B 57a35e8c3abe2476a1d35896ef702db76748f91065a68fca93b8f9f5117c7bc6d3ad9a100bf9c4164e2aea8e2f51db5ae77debe651e5a915d48aa6b120c19f4e SHA512 65e251c97e3c5fff6f3bd40910a5ee7b2e5152a86d3638aeb870283f8e415c833da3666647fc25add19e96c0534d5fac39090646cccc9cc10a2b07f5bcc5885f
diff --git a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
index 2a3e56bfa5f8..2c4e880bfbce 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -14,7 +14,7 @@ IUSE="${JAVA_PKG_IUSE}"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CDEPEND="
 	dev-java/bsf:2.3