gentoo resync : 03.01.2018

7 files changed, 274 insertions, 156 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 458f7ce62f5d..a486c1f78004 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index b74d80e486a9..2426614ea950 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,9 +1,9 @@
 DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
-DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
+DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
 DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
 DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
-EBUILD lucene-1.4.3-r3.ebuild 1069 BLAKE2B 52753ab3075d10637f22980acb1b793126adb6e8f080be0e84da0967575a2ca2d0c94c903f6a535d1ff243b36cd3e4c168c186f1ac0b50de1c6a719e847a8842 SHA512 e2110e99f3d724604e593c4d8f921c8a35ff4a91c20bf76a54276e6db24ce3287b9489c1a3b5b22750d4cf99ec744bd486d1e1e73d5f5b5f817c213062b658a7
-EBUILD lucene-2.4.1-r1.ebuild 1737 BLAKE2B 163976621dc900f064c092469900a2740d218f5b71b845af9c44a3e911cb111edfa79a481a84348b413abc486cc6792eac5c83bcbfe508e3d81ebb0a4ff073ea SHA512 33f9206b1b679d994e776ca035df5abf9411ceb7a807bc7c12963706168a223c40c2937bd7596255cce0028ab8979413badd73c3905484dcdd0db75d3b690724
-EBUILD lucene-3.5.0.ebuild 3269 BLAKE2B f504891e6665359f71dbcb65c33081d48a838091de300abdae84cee3f989bb35584860971226329a378e3d842dade981bca2d0ee51250f34daca7a2080c17bdc SHA512 c4bb455bc497599433bdbe0c86643de91c428112ad68d72e7e5165c7f4848764771d15359481f91c303b2988b8289cee1c5d03101d7c851d76d702dc38eff8e9
-EBUILD lucene-3.6.2.ebuild 4233 BLAKE2B 3b17702c4465c57c31186e902b3383527daabc36bb73aa6383aaad13c7123be036f98503046dfc604641359251fcc3718cb1e819895d6472491a211116a5eeaf SHA512 81fb07b209c67b604ab4b89095bb42ec98e6c52e887b37a75c9f33c34b3ccc0815b721530117766645d9d4c5ae8b60e875e06ab8a17c9c7cb26878ff1768c9ff
+EBUILD lucene-1.4.3-r4.ebuild 991 BLAKE2B 45c988b556fdc725a1ca374292f0bb952fe272c73fd30d19d6bd02f3ef585d5be80239dec4e17ea84fc6146dd8700c26456660d8f4db4d07a2ea422507803337 SHA512 f5b8d0574672f5d92ae00716fdf16df9695a568b8e18ac854a486484dbba5ea1637a85a086e05a447516f490e8774a0acc1b2d517865decde3f298de3185a3fc
+EBUILD lucene-2.4.1-r2.ebuild 1814 BLAKE2B c2b425b063c4b30f7b87a21760ca5639e1565ce04faf843937eb56a7160b4ff9579f5e7864a73e99fcbba1cf1d3f0b2368936cbae1749770a76e470093bde0b9 SHA512 848453a1c5e1ef8b7fffc6b349682bc060742ea33fd49b28cc9964560c793bf46eedfcec36bfbeda4d77eae6557daf9cc8c9d952ff2249ce591276e8340e8730
+EBUILD lucene-3.5.0-r1.ebuild 3514 BLAKE2B 4e944c04e995278521268166d300e292c21b477969505de26f56d2450c2461e2fe76040d52ab81218176ac52a1104de7de37f7f05e942975789710b5304e2b08 SHA512 c1cd0378af15f5c555cbb9459415552e10861738107a321b3023ce57b569b8733d6779cdb87bcc75ff1f2f526f8cc87a74aab8402fbc3d2ffdedab5a93c805db
+EBUILD lucene-3.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
 MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
diff --git a/dev-java/lucene/lucene-1.4.3-r3.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
index 3d238b008570..327f41c136f7 100644
--- a/dev-java/lucene/lucene-1.4.3-r3.ebuild
+++ b/dev-java/lucene/lucene-1.4.3-r4.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 JAVA_PKG_IUSE="doc examples source test"
+
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
+DESCRIPTION="High-performance, full-featured Java text search engine"
+HOMEPAGE="https://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+
+KEYWORDS="amd64 x86 ~x86-fbsd"
 LICENSE="Apache-1.1"
 SLOT="1"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		=dev-java/junit-3*
-		dev-java/ant-junit
-	)"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}/lib" || die
-	rm -v *.jar || die
+
+DEPEND="
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+src_prepare() {
+	default
+	java-pkg_clean
 }
 
 src_compile() {
@@ -31,17 +33,20 @@ src_compile() {
 
 src_test() {
 	java-ant_rewrite-classpath build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant test
 }
 
 src_install() {
-	dodoc CHANGES.txt README.txt || die
+	einstalldocs
 	java-pkg_newjar build/lucene-1.5-rc1-dev.jar
 
 	if use doc; then
-		dohtml -r docs/*
+		dodoc -r docs/*
 		java-pkg_dojavadoc build/docs/api
 	fi
+
 	use examples && java-pkg_doexamples src/demo
 	use source && java-pkg_dosrc src/java/org
 }
diff --git a/dev-java/lucene/lucene-2.4.1-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
deleted file mode 100644
index ae751585ba3d..000000000000
--- a/dev-java/lucene/lucene-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-# when doing version bump, SRC_URI of the previous version should most probably
-# be changed to java/archive/ !
-SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps
-	dev-java/javacc
-	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.5"
-
-src_prepare() {
-	sed -i -e '/-Xmax/ d' common-build.xml
-}
-
-src_compile() {
-	# regenerate javacc files just because we can
-	# put javacc.jar on ant's classpath here even when <javacc> task
-	# doesn't use it - it's to fool the <available> test, first time
-	# it's useful not to have ignoresystemclasses=true...
-	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
-	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
-	dodoc CHANGES.txt README.txt || die
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
-
-	if use doc; then
-		dohtml -r docs/* || die
-		# for the core and demo subdirs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..018d8ba1bac9
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-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="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+CDEPEND="
+	dev-java/javacc:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/junit:0
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i -e '/-Xmax/ d' common-build.xml || die
+
+	# Portage marks shese files as bogus for some reason.
+	find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-nodeps javacc" \
+		eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
+		javacc
+	ANT_TASKS="none" \
+		eant \
+		-Dversion=${PV} \
+		jar-core \
+		jar-demo \
+		$(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant \
+		test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-3.5.0.ebuild b/dev-java/lucene/lucene-3.5.0-r1.ebuild
index 0a804109766c..1c1898386a21 100644
--- a/dev-java/lucene/lucene-3.5.0.ebuild
+++ b/dev-java/lucene/lucene-3.5.0-r1.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+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"
-#JAVA_PKG_DEBUG=1
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
+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"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-nodeps:0
+
+CDEPEND="
 	dev-java/junit:4
 	dev-java/ant-junit:0
+	dev-java/ant-nodeps:0
 	contrib? (
 	          dev-java/jakarta-regexp:1.4
 			  dev-java/commons-compress:0
@@ -28,15 +29,36 @@ DEPEND=">=virtual/jdk-1.5
 	          dev-java/commons-logging:0
 			  dev-java/commons-beanutils:1.7
 	)"
-RDEPEND=">=virtual/jdk-1.5"
 
-#dev-java/javacc:0 - no longer needed, files are prebuilt
+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
+)
 
-java_prepare() {
-	#find -name "*.jar" -type f | xargs rm -v
+# 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
+		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
@@ -45,8 +67,8 @@ java_prepare() {
 	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/
+	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 \
@@ -64,41 +86,51 @@ java_prepare() {
 
 src_compile() {
 	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	ANT_TASKS="none" eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core $(use_doc javadocs-core )
-	if use contrib ; then
-	 ANT_TASKS="none" eant -Dversion=${PV} \
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
 		-Dfailonjavadocwarning=false \
-		build-contrib $(use_doc javadocs-all )
+		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 ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
 }
 
 src_install() {
-	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
-	    JRE_VERSION_MIGRATION.txt|| die
+	einstalldocs
 	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+
 	if use contrib; then
-		for i in `find  build/contrib -name \*-${PV}.jar`
-		do
+		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
-		dohtml -r docs/* || die
+		dodoc -r docs
 		java-pkg_dohtml -r build/docs/api
 	fi
 	if use source; then
-	     java-pkg_dosrc src/java/org || die
-	  	 if use contrib; then
-	    	java-pkg_dosrc  contrib  || die
-	  	 fi
+	     java-pkg_dosrc src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
 	fi
 }
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2-r1.ebuild
index a760e4fc1978..4dcb812a206d 100644
--- a/dev-java/lucene/lucene-3.6.2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r1.ebuild
@@ -1,48 +1,98 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+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"
-#JAVA_PKG_DEBUG=1
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
+HOMEPAGE="https://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
 LICENSE="Apache-2.0"
-SLOT="${PV:0:3}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=virtual/jdk-1.5
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+	dev-java/ant-ivy:2
+	dev-java/ant-junit:0
+	dev-java/ant-nodeps:0
+	dev-java/hamcrest-core:0
 	contrib? (
-			  dev-java/commons-beanutils:1.7
-			  >=dev-java/commons-codec-1.6:0
-	          dev-java/commons-collections:0
+	          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/jakarta-regexp:1.4
+			  dev-java/commons-beanutils:1.7
 	)"
-DEPEND="${RDEPEND}
-	dev-java/ant-nodeps:0
-	test? ( >=dev-java/junit-4.12:4
-			dev-java/hamcrest-core )
-	dev-java/ant-junit:0
-	>=dev-java/ant-ivy-2.2.0:2"
 
-#dev-java/javacc:0 - no longer needed, files are prebuilt
+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
+}
 
-java_prepare() {
-	#find -name "*.jar" -type f | xargs rm -v
+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
-	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib
+		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 \
@@ -53,8 +103,9 @@ java_prepare() {
 		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/
+	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 \
@@ -64,8 +115,8 @@ java_prepare() {
 	java-pkg_jar-from --build-only --into lib \
 		hamcrest-core
 
-	if use contrib ; then
-	    cd "${S}"/contrib/
+	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
@@ -88,43 +139,51 @@ java_prepare() {
 
 src_compile() {
 	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	einfo "Building main"
-	ANT_TASKS="none" eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core $(use_doc javadocs-core )
-	if use contrib ; then
-	  einfo "Building contrib"
-	 ANT_TASKS="none" eant -Dversion=${PV} \
+	java-ant_xml-rewrite -f common-build.xml \
+		-c -e javadoc \
+		-a failonerror \
+		-v "false"
+
+	ANT_TASKS="none" \
+		eant -Dversion=${PV} \
 		-Dfailonjavadocwarning=false \
-		build-contrib $(use_doc javadocs-all )
+		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 ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+		ANT_TASKS="ant-junit" \
+		eant test-core
 }
 
 src_install() {
-	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
-	    JRE_VERSION_MIGRATION.txt|| die
+	einstalldocs
 	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+
 	if use contrib; then
-		for i in `find  build/contrib -name \*-${PV}.jar`
-		do
+		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
-		dohtml -r docs/* || die
+		dodoc -r docs
 		java-pkg_dohtml -r build/docs/api
 	fi
 	if use source; then
-	     java-pkg_dosrc core/src/java/org || die
-	  	 if use contrib; then
-	    	java-pkg_dosrc  contrib  || die
-	  	 fi
+	     java-pkg_dosrc core/src/java/org
+	  	 use contrib && java-pkg_dosrc contrib
 	fi
 }