jmock-1.0 and commons-lang-2.1 are only needed by src_test which is now enabled

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686)

2 files changed, 83 insertions, 1 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 9171376cd115..b1f2b92e03c9 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.16 2008/04/27 20:03:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.17 2008/07/18 20:25:53 betelgeuse Exp $
+
+*xstream-1.2-r2 (18 Jul 2008)
+
+  18 Jul 2008; Petteri Räty <betelgeuse@gentoo.org> +xstream-1.2-r2.ebuild:
+  jmock-1.0 and commons-lang-2.1 are only needed by src_test which is now
+  enabled
 
   27 Apr 2008; Markus Meier <maekke@gentoo.org> xstream-1.2-r1.ebuild:
   amd64 stable, bug #211286
diff --git a/dev-java/xstream/xstream-1.2-r2.ebuild b/dev-java/xstream/xstream-1.2-r2.ebuild
new file mode 100644
index 000000000000..c713d5978f8f
--- /dev/null
+++ b/dev-java/xstream/xstream-1.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2-r2.ebuild,v 1.1 2008/07/18 20:25:53 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples java5 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://dist.codehaus.org/xstream/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPS="
+	=dev-java/cglib-2.1*
+	>=dev-java/dom4j-1.3
+	dev-java/jsr173
+	~dev-java/jdom-1.0
+	>=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/commons-lang:2.1
+		dev-java/jmock:1.0
+		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 dom4j-1
+	java-pkg_jar-from jdom-1.0
+	java-pkg_jar-from joda-time
+	java-pkg_jar-from xom
+	java-pkg_jar-from xpp3
+	java-pkg_filter-compiler jikes
+}
+
+src_test() {
+	java-pkg_jar-from --into lib \
+		junit,xml-writer,stax,commons-lang-2.1,jmock-1.0
+	ANT_TASKS="ant-junit ant-trax" eant test
+}
+
+src_install() {
+	java-pkg_newjar ${P}.jar
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/java/com
+}