Migrate to stax-api virtual.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 87 insertions, 5 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index b1f2b92e03c9..58d030a5140c 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2008/07/18 20:25:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.18 2008/10/05 16:53:11 serkan Exp $
+
+*xstream-1.2-r3 (05 Oct 2008)
+
+  05 Oct 2008; Serkan Kaba <serkan@gentoo.org> +xstream-1.2-r3.ebuild:
+  Migrate to stax-api virtual.
 
 *xstream-1.2-r2 (18 Jul 2008)
 
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 089a02fce6bc..b969e1bfe18f 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -5,13 +5,14 @@ AUX xstream-1.2-javadoc-fix.patch 829 RMD160 64385a5c8ca0750438cebb0ba547073bfbe
 DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
 EBUILD xstream-1.2-r1.ebuild 1938 RMD160 1f653ff581588ad68fda5a0d278b24e31abec39e SHA1 81531224435c9f2eb9adb2c7c697daa7862ac235 SHA256 7fe79c9ec91442677a67daeb917cc1e4ca65b8e757b7eecf9ac816b76adcada6
 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
-MISC ChangeLog 2438 RMD160 2beeb68c56192df6cd597eeb33eb88dd9d7c7485 SHA1 ac8ff0f0872947bb05620b9e8de8d18229678409 SHA256 0b0e3d90d239e09f0f0657e6fef9dfc1dd8ebe535901013b25a170ad46b27661
+MISC ChangeLog 2568 RMD160 5a5d51ad80f46d1ed1c6b92d8eed8b58984f3bd6 SHA1 e7b364b0145e1921ded9ff4adecc94deef3c07de SHA256 14d0443c195e59a42e04b2f3e9d88f867673578830ad572d311339bc2f1f5367
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiA/FoACgkQcxLzpIGCsLRRMgCeNulRQlFQlJmO56y/nEAIRQvK
-xjEAniRKf0UkM0tb1skxmLgvxoiAB6FM
-=aiO8
+iEYEARECAAYFAkjo8QAACgkQRh6X64ivZaK4FgCfehUTuVETZfygDO9Tf1Cc7uZg
+F88AnR56CALXDJTdAFu3hDjoB9YPQ/RD
+=CaJe
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.2-r3.ebuild b/dev-java/xstream/xstream-1.2-r3.ebuild
new file mode 100644
index 000000000000..679c5d7ae955
--- /dev/null
+++ b/dev-java/xstream/xstream-1.2-r3.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-r3.ebuild,v 1.1 2008/10/05 16:53:11 serkan 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
+	java-virtuals/stax-api
+	~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 --virtual stax-api
+	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
+}