gentoo resync : 18.03.2018

18 files changed, 471 insertions, 113 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ff1ffd1103af..3f1d7b03d850 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 93ee081b1a5b..ef9362108cf9 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,2 +1,3 @@
+EBUILD ant-1.9.2-r1.ebuild 2029 BLAKE2B 7af5e2d5b8eacccb9d973339a2339ecc7ae2487f4e4efea060e15b84ba0b28da3ac1a41c7239aa46402c7dc5f73faa28114f0cb1cf2d5f00972377aa41059b9a SHA512 55265f062ea8ab091a3225c315cba3bae142106198d98b10d4e2c0d044fb20fc64c22619277338cad4e08bc5697fb467216a1c23b6f8d46b6db9a6fbcc32dc3f
 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
new file mode 100644
index 000000000000..9d4439ac9ad9
--- /dev/null
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+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"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +log4j +oro +regexp +resolver testutil"
+
+DEPEND="~dev-java/ant-core-${PV}"
+
+RDEPEND="${DEPEND}
+	~dev-java/ant-core-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-apache-xalan2-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		# if we update from a version below 1.7.1
+		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
+			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+			elog "flags have been moved to dev-java/ant."
+			elog
+			elog "You may now freely set the USE flags of this package without breaking"
+			elog "building of Java packages, which depend on the exact ant tasks they need."
+			elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
+		fi
+	fi
+}
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 4ddfdf262e04..d15ec586e86d 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -2,6 +2,6 @@ AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb5
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
 DIST jna-3.4.1.tar.gz 35285043 BLAKE2B 192f893f25c692a80d8b3ea0b469e951ef45ea561a02f1ec2ac8292f37ac32df468c7bb04211f1009314da4d7acba8ab9220114980b3f30b56af5f2310d5a18a SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-EBUILD jna-3.4.1.ebuild 2305 BLAKE2B 260c90c967c3a9d751fce4fac7df76c9ae4bed2fdd57b963ed96a2e10d98809b3f0f170d370dfd53b06a5058b3d0764c254bac3bda8d90b5a4a937638c974e1d SHA512 b1847d11f7e80f3d1e29c642ff95c571c77ee352699249bf8c4ae70ee3032c10fe292cbc77e851438184f0535b7bfde72940a465f69bcb8b8d8ce71c4b3399b1
+EBUILD jna-3.4.1.ebuild 2294 BLAKE2B 9f9fe1c1498fe1e9d61d18a060d4110edb2c20f2f2ef87b3d0ea659f2c2205df2b02744eae9bf550f4868a8a1a8075d95caada773b6f42faa813475d36da08c3 SHA512 c81cbf7dfb8d3a54833a41f94fd763e7d6945c526a1651900c709514fbc3b32008f71de229e73188bf483f491dffd7b5778d9e6e4a6832defa89ae03f5961320
 EBUILD jna-4.2.2-r1.ebuild 2076 BLAKE2B b85f776feb0e705df3ca22af489d9095c30bd5085f08619de393edc8401ff4f1494d33988607b8c7cd815fd2ca0a03888723d87e93dee1a1d2a4aa85fb02fa8a SHA512 6b6485c517432b2e03c620dcab0fbec437dda6dfffe856b097d9bb71d9ba64a97609fd2f84afd152b14f2c3acc3c52ce67e701e2f026ceaff056c5185202c135
 MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index a3210becfbbc..0a2dbc3a57ed 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,8 +25,8 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-java/junit:0
+		dev-java/ant-core:0
 		dev-java/ant-junit:0
-		dev-java/ant-trax:0
 	)"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -59,7 +59,7 @@ java_prepare() {
 
 EANT_EXTRA_ARGS="-Ddynlink.native=true"
 
-EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
+EANT_TEST_ANT_TASKS="ant-junit ant-core"
 src_test() {
 	local sysprops=""
 
diff --git a/dev-java/jspeex/Manifest b/dev-java/jspeex/Manifest
index 8f3bd188e541..8450be585dfb 100644
--- a/dev-java/jspeex/Manifest
+++ b/dev-java/jspeex/Manifest
@@ -1,5 +1,5 @@
 AUX jspeex-0.9.7-remove-junit-report.patch 530 BLAKE2B 2ebc0fcdd0713615bdcb1c829e0f26437af3829cdf4d01f453a6f8a4df9b0728f2f4d746214d44a8fa63f61ccda1c7812fe22ee6c67b8b141021adb61d6076e9 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa
 AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 BLAKE2B 3ec50cada7bfd9b69a448f12fc1c07fc23003952e190ddafad4d58cb3cb1f13e746c02846cc17e2323d5c4ec7f76f049edb038e559c45f92854a23f72946b2e1 SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1
 DIST jspeex-0.9.7.zip 733580 BLAKE2B d5bfabb0857975ab8ca74d54401f6d4008c7386d8e2464c7386ecccfde8dcf3b92580d6168e4ff06cf8c1a27ca848abc7f630be7f19c6a0245beb8a9cb66c3f6 SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe
-EBUILD jspeex-0.9.7-r1.ebuild 1150 BLAKE2B 7364e5a6d3846c4aec6e024af31ba8e4bd7af5f51feea86d9f2bdcae93140996a671680987a614cf69b132d83b1b504e471c6a945a523f76c39b3457c0d2f89e SHA512 a816a6a0f3e12a2da2daf0ed90d00852ba341b280f3f6b7a5aa1fc6bf2676d97bed9162c9c990dffc21d2c6be3101800157f5b2df146156e9aaf8a92d9778a71
+EBUILD jspeex-0.9.7-r1.ebuild 1128 BLAKE2B 63ccb61ad93710e592be7845c5e3dd93afd425014d621ada0e1270e9fe42bbb7e823103d9744229b3b862766df254b998cbeba4b050b149f6addb994a00a1f33 SHA512 0b889a02983a970eb66e0be3464e96e3280641ae4d16a61f5fec11216e303dacea41af37e68417b2773a7a7ae05cbbc6614cc33dede51cb14e1b4734dbdcfcb5
 MISC metadata.xml 312 BLAKE2B 030ecc0c42a9dc6ecfaa663b6e25d35bc2364cfb1f7c59a5aeb46728d5819c29f9c5389370782f30a5598553e7d1822b7a6d2018006aa7a69e8e0a1a98ee8e68 SHA512 bf48f9daeb64e474b08e897e502436b21db0f65ba4cee4987654e811b6b71a3a82c3ccf9ee49b37babc9a8d8f3c6d13978d9c2e19b4ae27da51c1fc28f15aec5
diff --git a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
index 89f27c78cd74..9d3390743ccd 100644
--- a/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
+++ b/dev-java/jspeex/jspeex-0.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,7 +25,6 @@ DEPEND="${CDEPEND}
 	dev-java/junit:0
 	test? (
 		dev-java/ant-junit:0
-		dev-java/ant-trax:0
 	)"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -45,7 +44,7 @@ java_prepare() {
 }
 
 src_test() {
-	ANT_TASKS="ant-junit ant-trax" eant test
+	ANT_TASKS="ant-junit ant-core" eant test
 }
 
 src_install() {
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 4867c2989da0..0c968aab2e5e 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -5,5 +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.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
+EBUILD lucene-3.6.2-r2.ebuild 5555 BLAKE2B 14ba002faa12b7d11e2575bb7a76aacbf826499ef4be171ff0674e85f22ba9abe88184ed850572cc5a3dfd980f8191d85f6ce1c8ebd6510d21de193307ffb7b1 SHA512 082aa5ecf6a13d4e4b887be80b579372fe1a0e8a2784a20f56f223f62b1cf63c8b7a6b03d30f8827507f98b75f72d9943abf3642b9bcb5bd7feae170c0b60021
 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
new file mode 100644
index 000000000000..9eaf6f89d189
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/junit:4
+	dev-java/ant-junit:0
+	dev-java/ant-core:0
+	contrib? (
+	          dev-java/jakarta-regexp:1.4
+			  dev-java/commons-compress:0
+	          dev-java/commons-collections:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+			  dev-java/commons-beanutils:1.7
+	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DOCS=(
+	CHANGES.txt README.txt
+	NOTICE.txt CHANGES.txt
+	JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml || die
+
+	# FIXME: contrib builds do not work if junit not included
+	#java-pkg_jar-from --build-only --into lib \
+	#	junit-4 junit.jar junit-4.7.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+	if use contrib; then
+	  cd contrib/ || die
+	  java-pkg_jar-from --build-only --into queries/lib \
+	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-compress commons-compress.jar commons-compress-1.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-collections commons-collections.jar commons-collections-3.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-digester commons-digester.jar commons-digester-1.7.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	fi
+}
+
+src_compile() {
+	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core \
+		$(use_doc javadocs-core)
+
+	if use contrib; then
+		ANT_TASKS="none" \
+			eant -Dversion=${PV} \
+			-Dfailonjavadocwarning=false \
+			build-contrib \
+			$(use_doc javadocs-all)
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+
+	if use contrib; then
+		local i j
+		for i in $(find build/contrib -name \*-${PV}.jar); do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
+	fi
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
new file mode 100644
index 000000000000..6ff6151e9bb8
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/ant-ivy:2
+	dev-java/ant-junit:0
+	dev-java/ant-core:0
+	dev-java/hamcrest-core:0
+	contrib? (
+	          dev-java/jakarta-regexp:1.4
+			  dev-java/commons-compress:0
+	          dev-java/commons-collections:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+			  dev-java/commons-beanutils:1.7
+	)"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:4
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DOCS=(
+	CHANGES.txt README.txt
+	NOTICE.txt CHANGES.txt
+	JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml || die
+
+	# FIXME: contrib builds do not work if junit not included
+	#java-pkg_jar-from --build-only --into lib \
+	#	junit-4 junit.jar junit-4.7.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+	if use contrib; then
+	  cd contrib/ || die
+	  java-pkg_jar-from --build-only --into queries/lib \
+	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-compress commons-compress.jar commons-compress-1.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-collections commons-collections.jar commons-collections-3.1.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-digester commons-digester.jar commons-digester-1.7.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	  java-pkg_jar-from --build-only --into benchmark/lib \
+	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	fi
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i \
+		-e '/-Xmax/ d' \
+		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+		-e '/<ivy:retrieve/d' \
+		common-build.xml || die
+	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-ivy:2
+	java-pkg_jar-from --build-only --into lib \
+		junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into lib \
+		hamcrest-core
+
+	# Always needed anyway
+	cd "${S}"/test-framework/ || die
+	java-pkg_jar-from --build-only --into lib \
+		ant-core ant.jar ant-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		ant-junit ant-junit.jar ant-junit-1.7.1.jar
+	java-pkg_jar-from --build-only --into lib \
+		junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into lib \
+		hamcrest-core
+
+	if use contrib; then
+	    cd "${S}"/contrib/ || die
+		# queries
+	    java-pkg_jar-from --build-only --into queries/lib \
+	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
+		# benchmark
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-compress commons-compress.jar commons-compress-1.1.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-collections commons-collections.jar commons-collections-3.1.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-digester commons-digester.jar commons-digester-1.7.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	    java-pkg_jar-from --build-only --into benchmark/lib \
+	    	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+		# analyzers/phonetic
+	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
+	    	commons-codec commons-codec.jar commons-codec-1.6.jar
+	fi
+}
+
+src_compile() {
+	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core \
+		$(use_doc javadocs-core)
+
+	if use contrib; then
+		ANT_TASKS="none" \
+			eant -Dversion=${PV} \
+			-Dfailonjavadocwarning=false \
+			build-contrib \
+			$(use_doc javadocs-all)
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+
+	if use contrib; then
+		local i j
+		for i in $(find build/contrib -name \*-${PV}.jar); do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc core/src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
+	fi
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 8c0056d20edb..fd24bec28ded 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -10,6 +10,6 @@ EBUILD protobuf-java-3.0.2.ebuild 2150 BLAKE2B 0cd4177700cbe9a7850bffb6dc6c4c224
 EBUILD protobuf-java-3.1.0.ebuild 2147 BLAKE2B 51dd234d7873b295094ab1910a66d6be1db1b64e67680ad3abaca224d4b87eb5043afd4f080d06a7a7fe4dec15f2a46f81d6d26ab547bb83e342bc012ecca840 SHA512 fdec0f920fd80526440ea4909b8fcea86fec0d56f4ca8f5773d3d8747b49e747f7836c1714036a9815402af9f19f46581ed8332266baf93e8e9cef87258a4b87
 EBUILD protobuf-java-3.3.0.ebuild 2153 BLAKE2B 0d7fdf2a46cbfc78402339259d879952f92f6ade17667197040970b35d4f9b3e5f3d49c17d7d8d7d5a7c1a5006ba2f23774f815b86a6e8fb9abebff68246381b SHA512 1895a3f22215ce2cf3c57fcdc94375f3e18801499ff51ca1374ff2af15b821e8207b3c50267b4f9748aca5ddb85106c087e692120a2bec3e7c315f5ae942ddb2
 EBUILD protobuf-java-3.4.1.ebuild 2094 BLAKE2B a0a5f55af03a0ddbb447c00a407318e704518d2202b93d8cff929fb8bc9b5954d31e148ea0fbff642e6279b71552034aaf8d3e655f839e510a3520e2f6bd38a7 SHA512 c2646fff280006c14db9fc3fca89375137723d7fe3001b7a76825963af5e822cadc32e99fe66540f6471f99757800158a04bb0607169f17b970763c33333e38c
-EBUILD protobuf-java-3.5.1.1.ebuild 2092 BLAKE2B 72ed6c43d73d741cf2fc0e4d7ce218564aa1bc65f12734d0db229679bb11181256b56e2c1b1ac02a9e22d3cdc5b1104fe390705a04490f8e546a61b5019e18c7 SHA512 8273d8c4f41efedc8cf2b585a3886430dc6190b62c52c4d213923c2e16f40ebb07f9d2e05f3008bc48b1067443fb7508b0ac0a4f2596ad389a72c01c86bf2612
+EBUILD protobuf-java-3.5.1.1.ebuild 2091 BLAKE2B 3bef86c71300d1e06e603a43c15beef0a9fdf66d052923720b060422344741b6f49366b67782db63bcf2e41261163ff9720c0bf1b7d9b660034963f08b7a4792 SHA512 92aaecdf9edd8e1b6980f7279928ae7dffaa4f3716e2af21c65c501445d633d8a8da9c154fed0dc2253c8a04d69952d99d379417d6e992afa56e32f464d029d0
 EBUILD protobuf-java-3.5.2.ebuild 1813 BLAKE2B d46d3e2830806281fd67d804e13c2d88a090733270383f7c1e449b2b66f4ff012e15f0c62fa36a3ce32cd254f7b65f8f7a6849c8265e12fda2f6a9c5bd157c52 SHA512 c8f393561a64baa471ebabab77f8300837f548d9a2c03cd616a596f746fd0061599a9cedd642855f697f3b3e812b3cf789a76c03b875a900016f9fa6bcf77771
 MISC metadata.xml 873 BLAKE2B 129c7af2f68633ca3b98b5c5db45b94a808ec5d260b764f0e6d095409fb77f071f69e57b0dfc79cbd31752529916b2708ec8c7d676cf1e46aef4df794a77d6f5 SHA512 e6f903fb9a0e025d5c28bd51667d959d0ae9542c0325f6e845933231a976717ade53e665ca5eedf28b53b9aecd767bdfc040dfdb5f6dccd76c6e67a7c917a8eb
diff --git a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
index 86690cac5aac..2bea730d3d21 100644
--- a/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.5.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depends on the exact same version
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 57ce9290ec8f..5cc0dc1e9998 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -3,7 +3,6 @@ AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13
 DIST saxon6-5-5.zip 3346162 BLAKE2B 63d49545d101c3b595ff3f3db6d781158b8a51862ccdc294e782ac0935010a841405fb21663bd35853042c53548991dfefa7f789be292fe8497a29253c87ee09 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
-EBUILD saxon-9.2.0.6-r1.ebuild 2187 BLAKE2B 05de676a17049541880b530f6034eeb5bd17743e13ffc65f535b8aae674cdf0f243f56eeba2a93fc0a5a367bf3bf11f87f70a1abdb1cd593fbffcb2db7426bd9 SHA512 04fd1f6c2528ff86e26f553b20cd88d9c41652bc5407184f1ca4d134d68b8a96333dca911900ddc68afb76aeede7d25c01f85709ebab4dfd04f0feba4e698c89
 EBUILD saxon-9.2.0.6-r2.ebuild 1968 BLAKE2B 8fdfcee1e941b9c67cdfe5a8e9a9a511c157e07a4af04e80ffb57673f9457df52d3c1176af4e826e300189a944b525becff79eddc6d41e5e83726abe6ddad813 SHA512 1f1548e5f8bbea6a93a62cfee588939a6a50290a236075fe2968d4fd266f7cb5f69e85a8891a936f3560610db132caf6915252ea6eaa3cf656d19dbc858ffa49
 EBUILD saxon-9.2.0.6.ebuild 2191 BLAKE2B a383bf6d0e8cde78e45945ec028fa2fe5ff0a21051b4a05eb325147c88adc0376b6c250339da2fbcc99a8495d3975845aa832cd22c2cb235e4747cee333ba70d SHA512 c20b14dbad9faf4306a7ac0a1ccb3c49388197521185e4d6bbc3b9bfed9535432105cb3645071ba4ca0ed2faf1a7e40b2f6cbcf1e48abf1d6e305a28fcc29f85
 MISC metadata.xml 311 BLAKE2B fdce161da5c8394b66ee6b1bcebbccd863cd5e70291afab04400c4d806afc955f803b5c5aa15601157f2784e434baf505dcbebdbff9817fe960961f8108d3b63 SHA512 2fc12b71b9e977a095610f8f784f19252d44e31442cc5d5ce513f601a2394f4bf491fc9065de88bbf45afe7b8f1ca33ea907e31aa26875f48846856f1bf51126
diff --git a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild b/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
deleted file mode 100644
index 1a07be9cb9a0..000000000000
--- a/dev-java/saxon/saxon-9.2.0.6-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator java-pkg-2 java-ant-2
-
-MY_PV="$(replace_all_version_separators -)"
-
-DESCRIPTION="A XSLT and XQuery Processor"
-HOMEPAGE="http://saxon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}he${MY_PV}source.zip"
-
-LICENSE="MPL-1.0"
-SLOT="9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE=""
-
-# virtual/jdk slot for external javadoc
-JDK_VER="6"
-# dev-java/jdom slot for external javadoc
-JDOM_VER="0"
-# dev-java/dom4j slot
-DOM4J_VER="1"
-
-CDEPEND="dev-java/ant-core
-	dev-java/dom4j:${DOM4J_VER}
-	dev-java/jdom:${JDOM_VER}
-	dev-java/xom"
-RDEPEND=">=virtual/jre-1.${JDK_VER}
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.${JDK_VER}
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-# prepare eclass variables
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-
-src_unpack() {
-	unpack ${A}
-
-	### fedora-inspired remove
-
-	# deadNET
-	rm -rv net/sf/saxon/dotnet
-
-	# Depends on XQJ (javax.xml.xquery)
-	rm -rv net/sf/saxon/xqj
-
-	# This requires a EE edition feature (com.saxonica.xsltextn)
-	rm -v net/sf/saxon/option/sql/SQLElementFactory.java
-}
-
-java_prepare() {
-	# <major>.<minor> version
-	local version="$(get_version_component_range 1-2)"
-
-	# generate build.xml with external javadoc links
-	sed -e "s:@JDK@:${JDK_VER}:" \
-		-e "s:@JDOM@:${JDOM_VER}:" \
-		< "${FILESDIR}/${version}-build.xml" \
-		> "${S}/build.xml" \
-		|| die "build.xml generation failed!"
-
-	# prepare creates the dir for properties
-	eant prepare
-
-	# properties
-	cp -v \
-		"${FILESDIR}/${version}-edition.properties" \
-		"${S}/build/classes/edition.properties"
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars dom4j-${DOM4J_VER},jdom,xom)"
-	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
-	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
-	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc build/api
-
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/tapestry/Manifest b/dev-java/tapestry/Manifest
index 21ac06d25782..33f2faab49e3 100644
--- a/dev-java/tapestry/Manifest
+++ b/dev-java/tapestry/Manifest
@@ -3,4 +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
 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
new file mode 100644
index 000000000000..2a3e56bfa5f8
--- /dev/null
+++ b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Dynamic, robust, highly scalable web framework in Java"
+HOMEPAGE="https://tapestry.apache.org/"
+SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"
+
+IUSE="${JAVA_PKG_IUSE}"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/bsf:2.3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-codec:0
+	dev-java/commons-digester:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/jakarta-oro:2.0
+	dev-java/javassist:2
+	dev-java/ognl:3.0
+	dev-java/tomcat-servlet-api:2.4
+"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.4
+"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.4
+"
+
+S="${WORKDIR}/Tapestry-${PV}"
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-fileupload,commons-lang-2.1"
+EANT_GENTOO_CLASSPATH+=",commons-codec,commons-beanutils-1.7,commons-digester"
+EANT_GENTOO_CLASSPATH+=",tomcat-servlet-api-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
+EANT_GENTOO_CLASSPATH+=",javassist-2"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	default
+
+	mkdir config lib || die
+	cp "${FILESDIR}/Version.properties" config/ || die
+	cp "${FILESDIR}/build.properties" config/ || die
+	cp "${FILESDIR}/common.properties" config/ || die
+}
+
+src_compile() {
+	cd "${S}/framework" || die
+	eant -Dgentoo.classpath="$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
+	use doc && javadoc -sourcepath src/ org.apache.tapestry -d ../javadoc
+}
+
+src_install() {
+	java-pkg_newjar "lib/${P}.jar"
+	use source && java-pkg_dosrc framework/src/org
+	use doc && java-pkg_dojavadoc javadoc
+}
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index 798f1d9d593c..c77a66b9ac67 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,3 +1,3 @@
 DIST xmlunit-1.6-src.zip 830899 BLAKE2B 74bc5238667444fac0a6780090a76cf9c2a6fa4f0536bdde36858190cbd0528873b14b5ee05e098840be1b01e0ccfa3d2243ef63f92dae6cbfef1d84732f1f33 SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b
-EBUILD xmlunit-1.6.ebuild 1107 BLAKE2B 23f7895fc5f6c8fe5212fd9e07e5a6545cf9c38398583b8ee02a247279d188b2179a70dd5780da7be12b9e15f3c2e076133aff44e56e5c4cd1ed37ebe6c2368b SHA512 4b64d565a8eb4315bc27b8d960e103488ee203c6518ad0662d96f963f1a5f5ae201a31a8e028e4026573c793e278553d20fda1d9cae74a4fe72948f6bbf20b2e
+EBUILD xmlunit-1.6.ebuild 1107 BLAKE2B 2d74e0b4b38e2a8bfd7624573de1f7fd50deca0da2eb74d0c9e8f6e6a130dd7b2b55fba7f929cce7c8dd98f9079b0dcee0765837a6557713a81745d7c040d787 SHA512 2f2b130513571653bdf2535af57aa844b6205fd1943d5156220a7d3aed4c18e0f84f786ed5cb8bafebfb0116d5e258bc10d28fbd66643ddfb9fe70b06ae56f9d
 MISC metadata.xml 313 BLAKE2B a20fffbb3de91d48f2cec7edd9252f6e1e32e4cec7e825d8794742b8d30f0862d2a1daac0fa02d962cb6205eb7b42dd589890e861b46bc2ef4638efcf9abb914 SHA512 385494ac2513d58cfbbd905478df522a330e0b84afe4f35871d360c6ebcd099537c2a0fda301ea10dfed80bddcf57324325f3821442713dc85153de8b1e163c9
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
index a42ae29d3a59..b6e5dc47b97b 100644
--- a/dev-java/xmlunit/xmlunit-1.6.ebuild
+++ b/dev-java/xmlunit/xmlunit-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -22,7 +22,7 @@ DEPEND=">=virtual/jdk-1.6
 	doc? ( app-text/docbook-xsl-stylesheets:0 )
 	test? (
 		dev-java/ant-junit:0
-		dev-java/ant-trax:0
+		dev-java/ant-core:0
 	)
 	${CDEPEND}"
 
@@ -33,11 +33,11 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="junit"
 
 EANT_DOC_TARGET="users-guide-html javadocs"
-EANT_ANT_TASKS="ant-trax"
+EANT_ANT_TASKS="ant-core"
 EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
 
 src_test() {
-	ANT_TASKS="ant-junit ant-trax" eant test
+	ANT_TASKS="ant-junit ant-core" eant test
 }
 
 src_install() {