12 files changed, 102 insertions, 347 deletions
diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
deleted file mode 100644
index 1a72d74f13a..00000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jaxme:0
-	dev-java/relaxng-datatype:0
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/xsdlib:0
-	java-virtuals/stax-api:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)"
-
-java_prepare() {
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	# Add missing methods to compile on Java 5 #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,stax-api,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
-
-src_test() {
-	# Needs X11
-	rm -v src/test/org/dom4j/bean/BeansTest.java || die
-	# Fails with a 1.6 JDK for some reason
-	rm -v src/test/org/dom4j/io/StaxTest.java || die
-	# Fails with a 1.7 JDK for some reason
-	rm -v src/test/org/dom4j/rule/RuleTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
index 4ed4564591c..c43214986be 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,22 +16,27 @@ SRC_URI="
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-CDEPEND="dev-java/xpp2:0
+CDEPEND="
+	dev-java/xpp2:0
 	dev-java/xpp3:0
 	dev-java/jaxme:0
 	dev-java/xsdlib:0
 	dev-java/relaxng-datatype:0"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+
+DEPEND="
+	${CDEPEND}
 	test? (
 		dev-java/ant-junit:0
 		dev-java/junitperf:0
-	)"
+	)
+	>=virtual/jdk-1.6"
 
 java_prepare() {
 	# Circular deps with jaxen #212993
@@ -41,9 +46,9 @@ java_prepare() {
 	epatch "${WORKDIR}/${P}-java5.patch"
 }
 
-# 0 - Needs X11
-# 1 -Fails with a 1.7 JDK for some reason
-# 2 -Fails with a 1.6 JDK for some reason
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
 JAVA_RM_FILES=(
 	src/test/org/dom4j/bean/BeansTest.java
 	src/test/org/dom4j/io/StaxTest.java
@@ -67,7 +72,7 @@ src_test() {
 }
 
 src_install() {
-	java-pkg_dojar build/${PN}.jar
+	java-pkg_dojar "build/${PN}.jar"
 	use doc && java-pkg_dojavadoc build/doc/api
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 44cfdde4d18..2d954613537 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1,3 @@
 DIST jaxen-1.1.1-src.tar.gz 271343 SHA256 f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca SHA512 095523a1600324a2d2f748717c6af0ffe216120b834c1157912b57ea076c639aa3e47fe87da0316cae491ba838765e5e06bc304cdb610789101a54192d976940 WHIRLPOOL 2fec877f4b3e565304a7cd8bc7b5b391eaa74068c6bf241d8b2ef0fe5973273164247ec1166fedfbf92f082aa1120a4a3f0ce47e0e13a15add75ac00c128810a
 DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 WHIRLPOOL 44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
+DIST jaxen-1.1.6.jar 409677 SHA256 7d865e649e3dda2a26d9aee3f7f2e9e10569aee688463feb57d0bda16745eaa2 SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48 WHIRLPOOL a46f4be76d43a0072b4b426b41d5e2df800ec71582724cb0036f010cbc3a9c8e39d4fc87511f6dba79b329cee072feaec506d730bbcc6decc5325d3ccfe866f6
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
new file mode 100644
index 00000000000..70cfd567083
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.codehaus.org/"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+CDEPEND="
+	dev-java/dom4j:1
+	dev-java/jdom:0
+	dev-java/xom:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	xom
+	jdom
+	dom4j-1
+"
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 7d42334ec0d..770d574d02a 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,4 +1,3 @@
 DIST JDOM-2.0.6.tar.gz 8344114 SHA256 81790196ecbd9cf62cb2aa2a9c14153d74dae3a0364a9a262f42098c6d3c165d SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1 WHIRLPOOL 71df273140951ac9f5b2f9b06b7f8aa2fe43d05d93ceec9a508856a1cd5c571d897809d5b692fcf28ea0f45c203346b02745f170fac548b77e47904a3f8ce817
 DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
 DIST jdom-1.1.3.tar.gz 4233403 SHA256 d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 WHIRLPOOL b9f610001e152c41fcd3a0328b4ff563b33220f2cde8571ba09dd9063bc63fe51af80229c2bfdd7aeff4a0b354cd04a8d11f9fccb42b8620b2225c6f9ecd38e0
-DIST jdom-2.0.6.zip 7464948 SHA256 86b8683187ca28a935991cbffe5d1a9cfe88e5141e14905694a95e832f775b12 SHA512 dc84ede1eb05f7178a7f5b55f4035655096becee483966d7e0934484522c5981a1fdca836ae9ea6f3d2538c50b7a3cb9029264cd6427f5308d3ac7666e160cff WHIRLPOOL d568a18d8fc369ec0cf2954b16d2360ac934726c93ea31a59d75bc1913a9b1fba5d7cd02f6822ab21000b8df51380f2087e8690a3b66352e8d1267809091b374
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 5403ba96d4f..328bd8d32f9 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,18 +13,15 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
-COMMON_DEP="dev-java/saxpath
-		>=dev-java/xerces-2.7"
+IUSE=""
+
 RDEPEND=">=virtual/jre-1.6"
-#	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.6"
-#	${COMMON_DEP}"
-IUSE=""
 
 S="${WORKDIR}/${PN}"
 
 java_prepare() {
-	find "${S}" -name '*.jar' -delete || die
+	java-pkg_clean
 
 	rm -r build/apidocs || die
 
@@ -43,12 +40,9 @@ java_prepare() {
 }
 
 EANT_BUILD_TARGET="package"
-#EANT_GENTOO_CLASSPATH="saxpath,xerces-2"
 
 src_install() {
 	java-pkg_dojar build/*.jar
-
-	#java-pkg_register-dependency "jdom-jaxen-${SLOT}"
 	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
 	use doc && java-pkg_dojavadoc build/apidocs
 	use examples && java-pkg_doexamples samples
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 17153ec4366..5a1abb46927 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,17 +14,20 @@ SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
-CDEPEND="dev-java/iso-relax:0
+CDEPEND="
+	dev-java/xalan:0
 	dev-java/jaxen:1.1
-	dev-java/xalan:0"
+	dev-java/iso-relax:0"
 
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
 
-DEPEND="${CDEPEND}
+DEPEND="
+	${CDEPEND}
 	>=virtual/jdk-1.6
 	test? ( dev-java/ant-junit:0 )"
 
@@ -34,9 +37,14 @@ EANT_TEST_TARGET="junit"
 EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
 S="${WORKDIR}/${PN}-${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/build-xml-2.patch"
+)
+
 java_prepare() {
-	epatch "${FILESDIR}/build-xml-2.patch"
-	find -name "*.jar" -delete || die
+	java-pkg_clean
+
+	epatch "${PATCHES[@]}"
 
 	# Remove Android stuff to avoid junit RDEPEND.
 	rm -vr contrib/src/java/org/jdom2/contrib/android || die
diff --git a/dev-java/jdom/jdom-2.0.6.ebuild b/dev-java/jdom/jdom-2.0.6.ebuild
deleted file mode 100644
index 76dcf19c1d4..00000000000
--- a/dev-java/jdom/jdom-2.0.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="source test"
-
-#JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-COMMON_DEP="dev-java/iso-relax
-		dev-java/jaxen:1.1
-		dev-java/xalan
-		dev-java/xml-commons-external:1.4"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-	app-arch/unzip
-	test? ( dev-java/junit:0 )
-	>=virtual/jdk-1.6"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./${P}-sources.jar
-}
-
-java_prepare() {
-	find "${S}" -name '*.jar' -delete || die
-	mkdir "${S}"/classes "${S}"/docs
-}
-
-src_compile() {
-	find org -name "*.java" > "${T}"/src.list
-
-	local cp="$(java-pkg_getjars iso-relax,jaxen-1.1,xalan,xml-commons-external-1.4)"
-	if use test ; then
-		cp="${cp}:junit.jar"
-	else
-		sed -i 's/PerfTest/PerfTemp/' "${T}"/src.list || die "Failed to rename PerfTest"
-		sed -i '/test/Id' "${T}"/src.list || die "Failed to remove test classes"
-		sed -i 's/PerfTemp/PerfTest/' "${T}"/src.list || die "Failed to rename PerfTest"
-	fi
-
-	ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
-	# Disabled for the time being.
-	# if use doc; then
-	# 	ejavadoc -d "${S}"/docs -classpath ${cp} "@${T}"/src.list -quiet || die "javadoc failed"
-	# fi
-
-	cd "${S}"/classes
-	jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-
-	# Disabled for the time being.
-	# if use doc; then
-	# 	java-pkg_dojavadoc docs
-	# fi
-
-	dodoc README.txt LICENSE.txt || die
-	use source && java-pkg_dosrc org
-}
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index 3cce75cb59f..8204db7e135 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,20 +13,23 @@ HOMEPAGE="https://github.com/FasterXML/woodstox"
 SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
-CDEPEND="dev-java/sax:0
+CDEPEND="
+	dev-java/sax:0
 	dev-java/msv:0
 	dev-java/relaxng-datatype:0"
 
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
 
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+DEPEND="
+	${CDEPEND}
+	test? ( dev-java/ant-junit:0 )
 	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )"
+	>=virtual/jdk-1.6"
 
 EANT_BUILD_TARGET="jars"
 EANT_DOC_TARGET="javadoc"
diff --git a/dev-java/wstx/wstx-3.2.9.ebuild b/dev-java/wstx/wstx-3.2.9.ebuild
deleted file mode 100644
index a9852b817a1..00000000000
--- a/dev-java/wstx/wstx-3.2.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Woodstox is a high-performance validating namespace-aware XML-processor"
-HOMEPAGE="http://woodstox.codehaus.org/"
-SRC_URI="http://woodstox.codehaus.org/${PV}/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-COMMON_DEP="
-	dev-java/emma:0
-	dev-java/sax:0
-	java-virtuals/jaxp-virtual
-	dev-java/stax:0
-	dev-java/msv:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0
-	dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadoc"
-
-# Don't need to make a folder
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	rm -v lib/msv/*.jar || die
-	rm -v lib/*.jar || die
-
-	# Get rid of a missing include.
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-EANT_GENTOO_CLASSPATH="emma,sax,jaxp-virtual,msv,xsdlib,relaxng-datatype,junit"
-
-src_test(){
-	ANT_TASKS="ant-junit ant-nodeps ant-trax" eant test || die "Tests failed"
-}
-
-src_install() {
-	java-pkg_newjar build/"${PN}"-api-"${PV}".jar "${PN}"-api.jar
-	java-pkg_newjar build/"${PN}"-asl-"${PV}".jar "${PN}".jar
-	use doc && java-pkg_dojavadoc build/javadoc
-	use source && java-pkg_dosrc src
-}
diff --git a/dev-java/xstream/xstream-1.3.1-r3.ebuild b/dev-java/xstream/xstream-1.3.1-r3.ebuild
deleted file mode 100644
index 46fdf943ee6..00000000000
--- a/dev-java/xstream/xstream-1.3.1-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again"
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-# By default, these tests exit successfully on failure. Chewi has fixed
-# that below but it's probably because they blow up spectacularly on
-# every VM he has tried.
-RESTRICT="test"
-
-CDEPEND="dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jdom:1.0
-	dev-java/joda-time:0
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0
-	java-virtuals/stax-api:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-trax:0
-		dev-java/junit:4
-		dev-java/xml-writer:0
-		dev-java/commons-lang:2.1
-		dev-java/jmock:1.0
-		dev-java/jakarta-oro:2.0
-		dev-java/stax:0
-		dev-java/wstx:3.2
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison,stax-api"
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
-
-java_prepare() {
-	rm -v lib/*.jar || die
-	rm -rfv lib/jdk1.3 || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0"
-EANT_TEST_TARGET="test"
-ANT_TASKS="ant-junit ant-trax"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
-
-	use doc && java-pkg_dojavadoc target/javadoc
-	use source && java-pkg_dosrc src/java/com
-}
-
-pkg_postinst(){
-	elog "Major Changes from 1.2 See:"
-	elog "http://xstream.codehaus.org/changes.html"
-	elog "to prevent breakage ..."
-}
diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
index e0f82b3bb84..306f95876bf 100644
--- a/dev-java/xstream/xstream-1.3.1-r4.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
 SRC_URI="http://repo.maven.apache.org/maven2/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 # By default, these tests exit successfully on failure. Chewi has fixed
 # that below but it's probably because they blow up spectacularly on
@@ -22,21 +22,24 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 # last-rited, so we no longer bother to support them at all.
 RESTRICT="test"
 
-CDEPEND="dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/jdom:0
-	dev-java/joda-time:0
+CDEPEND="
 	dev-java/xom:0
+	dev-java/jdom:0
 	dev-java/xpp3:0
-	dev-java/xml-commons-external:1.3
-	dev-java/jettison:0"
+	dev-java/cglib:3
+	dev-java/dom4j:1
+	dev-java/jettison:0
+	dev-java/joda-time:0
+	dev-java/xml-commons-external:1.3"
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
+	${CDEPEND}
 	app-arch/unzip
-	${CDEPEND}"
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}/${P}/${PN}"
 
@@ -50,9 +53,9 @@ java_prepare() {
 	rm -rfv lib/jdk1.3 || die
 }
 
-src_install(){
-	java-pkg_newjar target/${P}.jar
-	java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
+src_install() {
+	java-pkg_newjar "target/${P}.jar"
+	java-pkg_newjar "target/${PN}-benchmark-${PV}.jar" "${PN}-benchmark.jar"
 
 	use doc && java-pkg_dojavadoc target/javadoc
 	use source && java-pkg_dosrc src/java/com