Fix for #267046 and #195955 (bumped cglib dependency as it should be).

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 92 insertions, 12 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 05e6c38e9be5..1f5081b09a6d 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.21 2009/04/20 20:22:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.22 2009/08/17 12:03:11 elvanor Exp $
+
+*xstream-1.3.1-r1 (17 Aug 2009)
+
+  17 Aug 2009; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +xstream-1.3.1-r1.ebuild:
+  Removed java5 USE flag (#267046), bumped cglib dependency to 2.2.
 
   20 Apr 2009; Markus Meier <maekke@gentoo.org> xstream-1.3.1:
   add ~amd64, bug #258616
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 5c4fd91478b1..7b20d2f3d995 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xstream-1.2-javadoc-fix.patch 829 RMD160 64385a5c8ca0750438cebb0ba547073bfbe73536 SHA1 eeca9df4c01083fc05fe67bd8c7abc427621f178 SHA256 b2aadc0ef4857240b31a248a37e532388ce2c45517f348df9ab3bb566948c828
 DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
 DIST xstream-distribution-1.3.1-src.zip 7505723 RMD160 01b0993881adc569d16fbb7df72def0046f44258 SHA1 7eace8ba0cc4c3cd7d5d8d31bc394b5b28613ed8 SHA256 df645ea4e2e16c4a149fb45966ea50d48b54776ead4727837348195daad94f6b
@@ -8,13 +5,7 @@ EBUILD xstream-1.2-r1.ebuild 1938 RMD160 1f653ff581588ad68fda5a0d278b24e31abec39
 EBUILD xstream-1.2-r2.ebuild 1782 RMD160 111c980f20c50998f74d638cd84102666cd1e4b6 SHA1 2e3d75b77a0f9c3d9a515a12d654c337abd45875 SHA256 ea3a3adc4809d1f43ebc854aea0f37d097bfc1d38a210ff612476e92122cd361
 EBUILD xstream-1.2-r3.ebuild 1797 RMD160 76bb599cc2ab1a4c36426e5eaa00904bb5d1fc25 SHA1 82a21918bd3288a1194cb3e8067608b22d761294 SHA256 97ca01d0b9bc321eaf393ec480f8afee4d61770fd49718d83d0af6cf9f24070f
 EBUILD xstream-1.2.ebuild 1904 RMD160 b8119d34fb6373615a7b7d41b972afb69de33791 SHA1 cb7c5e1a30155eb402fa041f1ce26c5b357ea02a SHA256 338ee81a859aeb2c05b20886b5caf502e4b5aaf10d7aa07575c93915512bd75c
+EBUILD xstream-1.3.1-r1.ebuild 2007 RMD160 d53bb963fe1c22bcb0c179a672a8a8db887d17b8 SHA1 ae869fb3f8b88f3e3ff1c2ed0d4b8d02ead192e8 SHA256 04de462ac2311c46fc9f41e11018285f2acb7f3e780d4ea32f9f9f2ea1fec9fd
 EBUILD xstream-1.3.1.ebuild 2093 RMD160 6be19dae92c48770f140c808d8f6bf4f80c34ccd SHA1 068bc492686e77a6ad3a5f847e4a92977a0c2977 SHA256 ea3a4d3b816e5611d55e54463cf8d2a9f0ff3cff66d7325b5eb6733df4a3dde0
-MISC ChangeLog 2967 RMD160 1a1039f0c65a8d74951840e683a6fb958ab034ad SHA1 2a2af088bac0f2f6ad61c51fb9b6de75c1c132d5 SHA256 79b6d41d0dcaa1e36dfdb4b4aacab7ed80bec63897daa30b3791d3062980c19a
+MISC ChangeLog 3155 RMD160 714cd04edc6dbbdbca028e6754610caa1c5224bb SHA1 879b1c009c5df2d6c4f599f85fb2fd885cbe89ee SHA256 6ee6d80c1574f658b0851bda34fdde728fcb4dedbd7dcb851c016a1b602d7375
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkns2bsACgkQkKaRLQcq0GIQewCfax2oJXGtWvIySWEe7etXdNfz
-evcAn24LWSYK4v1tl/WHHHkeo+AiQMph
-=8J1c
------END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.3.1-r1.ebuild b/dev-java/xstream/xstream-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..0ef9cddee7e2
--- /dev/null
+++ b/dev-java/xstream/xstream-1.3.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/08/17 12:03:11 elvanor Exp $
+
+EAPI=1
+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"
+
+IUSE=""
+
+COMMON_DEPS="
+	dev-java/cglib:2.2
+	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
+	test? (
+		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
+	)"
+
+DEPEND="
+	>=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEPS}"
+RDEPEND="
+	>=virtual/jre-1.5
+	${COMMON_DEPS}"
+
+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-2.2
+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 ..."
+}