Add missing test deps on ant-junit and ant-trax, remove old.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 10 insertions, 102 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index ca48d1c49eda..39d5870578b3 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.27 2010/01/20 02:53:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.28 2010/01/22 11:08:38 caster Exp $
+
+  22 Jan 2010; Vlastimil Babka <caster@gentoo.org> -xstream-1.2-r1.ebuild,
+  -files/xstream-1.2-javadoc-fix.patch, xstream-1.3.1-r1.ebuild:
+  Add missing test deps on ant-junit and ant-trax, remove old.
 
   20 Jan 2010; Brent Baude <ranger@gentoo.org> xstream-1.3.1-r1.ebuild:
   Marking xstream-1.3.1-r1 ppc64 for bug 287619
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 293b9729e77a..ca3e3c651403 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,7 +1,4 @@
-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
-EBUILD xstream-1.2-r1.ebuild 1921 RMD160 84e152a318d6844eef338288f83ad1c007b791e8 SHA1 586e44807cee8e81a069aa4d8dafb9b699a2fc7f SHA256 8abae74ae6a1b277340f40602ac83ed3e8a93a01ab5e8855312ba1f6961e2dfe
-EBUILD xstream-1.3.1-r1.ebuild 2048 RMD160 b1f7038f2ce09d8e7761453add45b2feba7842dc SHA1 9dcee09af8e5af2bf664c305512977f499e1c905 SHA256 3a3ac6b611c623389ffa13dc029a8a9601d4b4e8a99e1fa920a5707f957e2aef
-MISC ChangeLog 3887 RMD160 56e3a1a791b154297a861396dc4536c8d160e233 SHA1 7563b11a6d01509037022eea1b76f713fdebf8ef SHA256 6b7ba77a92f2b221e118736e4ec268fe91c170a3ac2c797165b2b931abd166c8
+EBUILD xstream-1.3.1-r1.ebuild 2089 RMD160 866c4fb8a66c16f2d6cec1679199458992004f2d SHA1 6ec7b0adb1d1343c096c5a2eefa344dcc14204b9 SHA256 ba702a1042dc60c2c37d84167c43c11895d1c38142cd24df640298f937ae7246
+MISC ChangeLog 4091 RMD160 8818d0c346e5d5b2ad7392073d40dbd660fdf328 SHA1 96e54a500a88302bab381311f8d6c324d64668cc SHA256 5743934a63d47dbd5c219f25e94c9bccb17263c9904a775928318ec708fa637b
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch b/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch
deleted file mode 100644
index 4b46558d058d..000000000000
--- a/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build.xml.orig	2008-01-08 19:35:17.000000000 +1300
-+++ build.xml	2008-01-08 19:39:04.000000000 +1300
-@@ -141,6 +141,9 @@
-             <packageset dir="src/java" defaultexcludes="yes">
-                 <exclude name="com/thoughtworks/xstream/core/**"/>
-                 <exclude name="com/thoughtworks/xstream/io/xml/xppdom/**"/>
-+                <excludesfile name="jdk-1.5-minimum.txt" unless="jdk1.5.available" />
-+                <excludesfile name="jdk-1.5-specific.txt" unless="jdk1.5.available" />
-+                <excludesfile name="jdk-1.4-specific.txt" unless="jdk1.4.available" />
-             </packageset>
-             <doctitle><![CDATA[<h1>XStream ${version}</h1>]]></doctitle>
-             <bottom><![CDATA[<i>Joe Walnes, <a href="http://xstream.codehaus.org">http://xstream.codehaus.org/</a></i>]]></bottom>
diff --git a/dev-java/xstream/xstream-1.2-r1.ebuild b/dev-java/xstream/xstream-1.2-r1.ebuild
deleted file mode 100644
index edbe7eb8c742..000000000000
--- a/dev-java/xstream/xstream-1.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.2-r1.ebuild,v 1.7 2009/11/17 14:46:49 caster Exp $
-
-JAVA_PKG_IUSE="doc examples java5 source"
-
-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://dist.codehaus.org/xstream/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE=""
-
-COMMON_DEPS="
-	>=dev-java/commons-lang-2.1
-	=dev-java/cglib-2.1*
-	>=dev-java/dom4j-1.3
-	dev-java/jsr173
-	~dev-java/jdom-1.0
-	=dev-java/jmock-1*
-	>=dev-java/joda-time-1.2
-	dev-java/xom
-	>=dev-java/xpp3-1.1.3.4
-	=dev-java/xml-commons-external-1.3*
-"
-#test? (
-#		dev-java/ant-junit
-#		dev-java/ant-trax
-#		dev-java/xml-writer
-#		dev-java/stax
-#	)
-
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	app-arch/unzip
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-javadoc-fix.patch"
-	rm -v *.jar || die
-	rm -v lib/jdk1.3/*.jar || die
-	cd "${S}/lib"
-	rm -v *.jar
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from jsr173
-	java-pkg_jar-from cglib-2.1
-	java-pkg_jar-from commons-lang-2.1
-	java-pkg_jar-from dom4j-1
-	java-pkg_jar-from jdom-1.0
-	java-pkg_jar-from jmock-1.0
-	java-pkg_jar-from joda-time
-	java-pkg_jar-from xom
-	java-pkg_jar-from xpp3
-	java-pkg_filter-compiler jikes
-}
-
-# Restricted until we get keywords for deps. See:
-# https://bugs.gentoo.org/show_bug.cgi?id=184234
-RESTRICT="test"
-
-src_test() {
-	java-pkg_jar-from --into lib junit,xml-writer,stax
-	ANT_TASKS="ant-junit ant-trax" eant test
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar
-
-	if use doc; then
-		java-pkg_dojavadoc javadoc
-	fi
-	use source && java-pkg_dosrc src/java/com
-}
diff --git a/dev-java/xstream/xstream-1.3.1-r1.ebuild b/dev-java/xstream/xstream-1.3.1-r1.ebuild
index 58f20ad33668..cd137255ce10 100644
--- a/dev-java/xstream/xstream-1.3.1-r1.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.5 2010/01/20 02:53:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.3.1-r1.ebuild,v 1.6 2010/01/22 11:08:38 caster Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source test"
@@ -28,6 +28,8 @@ COMMON_DEPS="
 	dev-java/jettison:0
 	java-virtuals/stax-api
 	test? (
+		dev-java/ant-junit
+		dev-java/ant-trax
 		dev-java/junit:0
 		dev-java/xml-writer:0
 		dev-java/commons-lang:2.1