Fix building javadocs on jdk-1.4

Package-Manager: portage-2.1.4_rc14

4 files changed, 33 insertions, 12 deletions

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index a235cba0f85b..4f41aba697bf 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2007/11/16 06:27:13 ali_bush Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.12 2008/01/08 07:01:07 ali_bush Exp $
+
+  08 Jan 2008; <alistair@gentoo.org> +files/xstream-1.2-javadoc-fix.patch,
+  xstream-1.2-r1.ebuild:
+  Actually fixed building javadocs on jdk-1.4
 
 *xstream-1.2-r1 (16 Nov 2007)
 
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index a9cb25e0d109..226432db6277 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,16 +1,20 @@
+AUX xstream-1.2-javadoc-fix.patch 829 RMD160 64385a5c8ca0750438cebb0ba547073bfbe73536 SHA1 eeca9df4c01083fc05fe67bd8c7abc427621f178 SHA256 b2aadc0ef4857240b31a248a37e532388ce2c45517f348df9ab3bb566948c828
+MD5 67a07798d023db0bc9a453f9922fe999 files/xstream-1.2-javadoc-fix.patch 829
+RMD160 64385a5c8ca0750438cebb0ba547073bfbe73536 files/xstream-1.2-javadoc-fix.patch 829
+SHA256 b2aadc0ef4857240b31a248a37e532388ce2c45517f348df9ab3bb566948c828 files/xstream-1.2-javadoc-fix.patch 829
 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-r1.ebuild 1936 RMD160 1b0c5e14db6f346729ef2e6b028a50fed9743354 SHA1 d96ed0103fc7d5cb58211a5e2367ef54b6c50e60 SHA256 f04bafb299c936235017b8f324fd1e277f653f89300d8ffb8b1fb9f1d0a8be54
+MD5 80e1c70c2fb881be0707066b652175c8 xstream-1.2-r1.ebuild 1936
+RMD160 1b0c5e14db6f346729ef2e6b028a50fed9743354 xstream-1.2-r1.ebuild 1936
+SHA256 f04bafb299c936235017b8f324fd1e277f653f89300d8ffb8b1fb9f1d0a8be54 xstream-1.2-r1.ebuild 1936
 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 1691 RMD160 f7cb919422ebe98c5bcb7521f9f2e225da8bcca9 SHA1 dfd1271a1cc071813251473b23e748378c3bb9d4 SHA256 e43caa1fb4b97c8cdb47dadd2951c50bd267c3a5d50d7ce19d0773bb0081791e
-MD5 ea7d9705a1eec5d5449979bad6bebad7 ChangeLog 1691
-RMD160 f7cb919422ebe98c5bcb7521f9f2e225da8bcca9 ChangeLog 1691
-SHA256 e43caa1fb4b97c8cdb47dadd2951c50bd267c3a5d50d7ce19d0773bb0081791e ChangeLog 1691
+MISC ChangeLog 1838 RMD160 3763e7b2d7c6355e3639eb4af9851fcb6addd8e7 SHA1 3f90174840558381c1eec49de55ad4ca6cfca8f3 SHA256 08de3af5b88179aa9feca0fca95bc96dabe18fff3796bb52d42de27897f68e0a
+MD5 e153a17a282578bfab743360879a5fc8 ChangeLog 1838
+RMD160 3763e7b2d7c6355e3639eb4af9851fcb6addd8e7 ChangeLog 1838
+SHA256 08de3af5b88179aa9feca0fca95bc96dabe18fff3796bb52d42de27897f68e0a ChangeLog 1838
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch b/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch
new file mode 100644
index 000000000000..4b46558d058d
--- /dev/null
+++ b/dev-java/xstream/files/xstream-1.2-javadoc-fix.patch
@@ -0,0 +1,12 @@
+--- 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
index fe05fd94c2a6..c01e31fd4bc9 100644
--- a/dev-java/xstream/xstream-1.2-r1.ebuild
+++ b/dev-java/xstream/xstream-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2007/11/16 06:27:13 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2-r1.ebuild,v 1.2 2008/01/08 07:01:07 ali_bush Exp $
 
 JAVA_PKG_IUSE="doc examples java5 source"
 
@@ -46,6 +46,7 @@ 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"