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

(Portage version: 2.2_rc61/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 8 insertions, 97 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/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