SLOT and EAPI bump wrt bug 546288. Drop ppc and ppc64 keywords.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

3 files changed, 110 insertions, 3 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index baa0ff561505..0c9d2ce147d6 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xstream
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.31 2014/10/19 04:08:35 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.32 2015/04/14 20:13:59 monsieurp Exp $
+
+*xstream-1.3.1-r2 (14 Apr 2015)
+
+  14 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +xstream-1.3.1-r2.ebuild:
+  SLOT and EAPI bump wrt bug 546288. Drop ppc and ppc64 keywords.
 
   19 Oct 2014; Patrick Lauer <patrick@gentoo.org> xstream-1.3.1-r1.ebuild:
   Move test dependencies to DEPEND only
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 5df8f5a3811a..55bf54e730df 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST xstream-distribution-1.3.1-src.zip 7505723 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b SHA512 c8c92879a26599d7444fce0638ba13d185fd3c1f42962b92fe1b984d2ea41f8e434acb6af5613ac9f44354816fb7abc60f751f864f36deb9c2413b0caec5c2ac WHIRLPOOL 13ac006402bbecbf6d3ff9fe30662cc6e3807cdf3a391255f878cea37800842adc929914f2e4aace3a7788294809afb26edd64181f85a7e5dc46f3e1f9c0e9b6
 EBUILD xstream-1.3.1-r1.ebuild 2119 SHA256 1818fbdcc2d8b68d5b2d702a67322efde5d60a325322c12f836c11696430cbbd SHA512 6027eba9cb7e37d2c81a1bebb6a9f5b7eb67b68cdbb363f43978ab584a5680cea82757fe0a255282f8589134bee3ca76d70d20a7d6f97cf86f0c88e9a38e0e6e WHIRLPOOL 59fc0ea003834ab1d54da6c2994b1bfb79c6dd9a0912d4449faef9d3a41f60917683d80a20d70b3a7d3965b9446dd686168beb535b7fd8e9892d8e4b57c1a742
-MISC ChangeLog 4455 SHA256 8d2b8be3e5e4beb178dbb1460d61f0af65172ae25b6275f0b90af648b85f9942 SHA512 e68a6acd500a694bccb74bdee09c9d2fe45497b7e499b4a22e7374671e67f453475d92c69da60a71fff939f312728180df92c382355690ef2d3d079265c547ab WHIRLPOOL 2c63f1325374d6fb4040ca931cc63ddf2c6be5d84a7d9b172e10d8f650a0e65628a8af97877c109842a65704ea3eae7bc4b61c57ae6b3828322700c5c0d277b0
+EBUILD xstream-1.3.1-r2.ebuild 2098 SHA256 9638b3341406da31542840c695a08383d0a8e833263e8f19222e51e1dd2e9c3d SHA512 3c80d64e56829926f98db94550471a34ca7301171cade0104317b8ba53efd22f4798baad6d414e2ec4cf70b9c6df5069836c306e32a3073a29c81582c19db568 WHIRLPOOL bda7bdcc80ff63a2aeeda103508c77f8daf58507d3a779e8d95d7b8a01ef1e7bcfbcf44248a2b2359611e5851291bda8e2a26f7378a533b3e65adcf346e642e6
+MISC ChangeLog 4637 SHA256 1aaa5dba1e2a2a41b4c5ff76975a8792abc8573bcaaade590d79a4c1ddf43ea7 SHA512 71d87dbc2e7a0a326c9810493c277b63a28de5c2d74f9c365e5aaf498c977c8708c3cd762485683ce339ea10467fd350a920e342b0667ecf732ac1a4c500092d WHIRLPOOL 0573343d482bd99c963f483286098ee6b5ea7642446fb4f5b445a6fa891af09171f20057dcc3c19663c354e7593237316b6c7869d8fd530c6c86e17ccfd33197
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVLXVCAAoJEJGRpfGTSRu4vCsH/1rAhTvZemPfC1iU1EazuFnB
+RXbMMU3XfCTqxjCAp09ybvI2SwOU0qdUCuw4jWpis/El/sfOLKqDrYX1hAyH3yeg
+xILFKrvcYyKN7PGpWqxpxf2PGslq2qwJq05R8y6n4HLm7G/Guv/JrRYqJAcF5Jb7
+SjLCPArLM0AuuKk8lMkXVQF3XYpef+by7NUfcFBetEYn+mpd6jPF9nBh9huhiUTf
+hAhOfzU2Rg9X47+auWp0oEOIf7An0GZjKSsWoWE4RdYnVmJ6ajodUPTIlCSD/Tge
+sq+9qBBY4PqvuerY6xWUaFn4nsr1RyqQrXIRQSH5kOfbLpdNpcrhSev9HzMPIb8=
+=syfb
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.3.1-r2.ebuild b/dev-java/xstream/xstream-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..0c363255f0af
--- /dev/null
+++ b/dev-java/xstream/xstream-1.3.1-r2.ebuild
@@ -0,0 +1,87 @@
+# 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-r2.ebuild,v 1.1 2015/04/14 20:13:59 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 ~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
+	"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit
+		dev-java/ant-trax
+		dev-java/junit:0
+		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}"
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+	rm -v *.jar || die
+	rm -rf jdk1.3 || die
+}
+
+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}"
+
+src_test(){
+	EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+		junit,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0" \
+		ANT_TASKS="ant-junit ant-trax" eant test || die "Tests failed"
+}
+
+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 ..."
+}