Reworked EAPI 5 bump. Add back ppc+ppc64. Mark stable for x86+amd64 (signed off by ago).

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 93491BB8)

2 files changed, 88 insertions, 1 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index f2a6ac5d1c67..ab2ebf3485f0 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.34 2015/06/13 11:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.35 2015/06/13 12:48:37 monsieurp Exp $
+
+*xstream-1.3.1-r3 (13 Jun 2015)
+
+  13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +xstream-1.3.1-r3.ebuild:
+  Reworked EAPI 5 bump. Add back ppc+ppc64. Mark stable for x86+amd64 (signed
+  off by ago).
 
   13 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xstream-1.3.1-r2.ebuild:
   Stable for x86, wrt bug #551524
diff --git a/dev-java/xstream/xstream-1.3.1-r3.ebuild b/dev-java/xstream/xstream-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..ab15c2e9cc6e
--- /dev/null
+++ b/dev-java/xstream/xstream-1.3.1-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r3.ebuild,v 1.1 2015/06/13 12:48:37 monsieurp Exp $
+
+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 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE=""
+
+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}"
+
+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 ..."
+}