Bumping to fix doc install bug

Package-Manager: portage-2.1.3.19

4 files changed, 102 insertions, 15 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 3acfdcdfaa98..a235cba0f85b 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.10 2007/11/13 13:23:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.11 2007/11/16 06:27:13 ali_bush Exp $
+
+*xstream-1.2-r1 (16 Nov 2007)
+
+  16 Nov 2007; <alistair@gentoo.org> +xstream-1.2-r1.ebuild:
+  Bumping to fix doc install.
 
   13 Nov 2007; Christian Faulhammer <opfer@gentoo.org> xstream-1.2.ebuild:
   filtered jikes
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 02d409e16fe6..a9cb25e0d109 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
+EBUILD xstream-1.2-r1.ebuild 1891 RMD160 438ca705788d2540d500e57745913fb188a25eee SHA1 8f7b2a9a9870a84df16b2b6b68c49f68585f7951 SHA256 69cf5b82737140286f8b2fda5dada638e6c5d017badfaf660395511b6ac6872d
+MD5 e684f388900a57c2cb2566437b051ebe xstream-1.2-r1.ebuild 1891
+RMD160 438ca705788d2540d500e57745913fb188a25eee xstream-1.2-r1.ebuild 1891
+SHA256 69cf5b82737140286f8b2fda5dada638e6c5d017badfaf660395511b6ac6872d xstream-1.2-r1.ebuild 1891
 EBUILD xstream-1.2.ebuild 1904 RMD160 b8119d34fb6373615a7b7d41b972afb69de33791 SHA1 cb7c5e1a30155eb402fa041f1ce26c5b357ea02a SHA256 338ee81a859aeb2c05b20886b5caf502e4b5aaf10d7aa07575c93915512bd75c
 MD5 99aca864b070c07c3dca7ec4c0aa3b03 xstream-1.2.ebuild 1904
 RMD160 b8119d34fb6373615a7b7d41b972afb69de33791 xstream-1.2.ebuild 1904
 SHA256 338ee81a859aeb2c05b20886b5caf502e4b5aaf10d7aa07575c93915512bd75c xstream-1.2.ebuild 1904
-MISC ChangeLog 1565 RMD160 7eaae9e576fbf901ddfcbd1794b63f39c1d48159 SHA1 2fc810a0089c661e883d2c36170a232d71371d99 SHA256 a0e18db35b1f1c8a241c1d50eae5669ae5d4afcc6e633f052b3307f05820e95d
-MD5 6d878d5a8c1adfe60402929f1874bb4e ChangeLog 1565
-RMD160 7eaae9e576fbf901ddfcbd1794b63f39c1d48159 ChangeLog 1565
-SHA256 a0e18db35b1f1c8a241c1d50eae5669ae5d4afcc6e633f052b3307f05820e95d ChangeLog 1565
+MISC ChangeLog 1691 RMD160 f7cb919422ebe98c5bcb7521f9f2e225da8bcca9 SHA1 dfd1271a1cc071813251473b23e748378c3bb9d4 SHA256 e43caa1fb4b97c8cdb47dadd2951c50bd267c3a5d50d7ce19d0773bb0081791e
+MD5 ea7d9705a1eec5d5449979bad6bebad7 ChangeLog 1691
+RMD160 f7cb919422ebe98c5bcb7521f9f2e225da8bcca9 ChangeLog 1691
+SHA256 e43caa1fb4b97c8cdb47dadd2951c50bd267c3a5d50d7ce19d0773bb0081791e ChangeLog 1691
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -17,10 +18,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 6d138d9666f6785f28e28165c66e23d0 files/digest-xstream-1.2 229
 RMD160 9d60b66396216af85c361aef31f3780db784d222 files/digest-xstream-1.2 229
 SHA256 0e41d935f72c2fdf5a134ce035cb5da96c42f26777e1df3e2f6b8559d3676bc0 files/digest-xstream-1.2 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHOaVJNQqtfCuFneMRArN8AKCPWeISGKagBLwhYznL4VqduZV9gwCZAUDU
-QTKv7Zes56+QTGT6fjVhLa4=
-=qAlc
------END PGP SIGNATURE-----
+MD5 6d138d9666f6785f28e28165c66e23d0 files/digest-xstream-1.2-r1 229
+RMD160 9d60b66396216af85c361aef31f3780db784d222 files/digest-xstream-1.2-r1 229
+SHA256 0e41d935f72c2fdf5a134ce035cb5da96c42f26777e1df3e2f6b8559d3676bc0 files/digest-xstream-1.2-r1 229
diff --git a/dev-java/xstream/files/digest-xstream-1.2-r1 b/dev-java/xstream/files/digest-xstream-1.2-r1
new file mode 100644
index 000000000000..89340ca3b879
--- /dev/null
+++ b/dev-java/xstream/files/digest-xstream-1.2-r1
@@ -0,0 +1,3 @@
+MD5 488fd2742f2d9f2b8bfe9acd8bccd097 xstream-1.2.zip 5488349
+RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff xstream-1.2.zip 5488349
+SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d xstream-1.2.zip 5488349
diff --git a/dev-java/xstream/xstream-1.2-r1.ebuild b/dev-java/xstream/xstream-1.2-r1.ebuild
new file mode 100644
index 000000000000..fe05fd94c2a6
--- /dev/null
+++ b/dev-java/xstream/xstream-1.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 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.1 2007/11/16 06:27:13 ali_bush 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="~amd64 ~ppc ~x86"
+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}"
+	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
+}