Revision bump to fix building with jrockit-jdk-bin wrt bug #142692. Thanks to masayuko <igarashi@gentoo.gr.jp> for the patch.

Package-Manager: portage-2.1.1

5 files changed, 84 insertions, 5 deletions

diff --git a/dev-java/xjavac/ChangeLog b/dev-java/xjavac/ChangeLog
index 9a0977616ddc..4d9fb8882df9 100644
--- a/dev-java/xjavac/ChangeLog
+++ b/dev-java/xjavac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xjavac
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.12 2006/09/10 02:54:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.13 2006/09/10 13:49:31 caster Exp $
+
+*xjavac-20041208-r4 (10 Sep 2006)
+
+  10 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/xjavac-more-vendors.patch, +xjavac-20041208-r4.ebuild:
+  Revision bump to fix building with jrockit-jdk-bin wrt bug #142692. Thanks to 
+  masayuko <igarashi@gentoo.gr.jp> for the patch.
 
   10 Sep 2006; Joshua Nichols <nichoj@gentoo.org> xjavac-20041208-r3.ebuild:
   Keyworded ~ia64
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 186ecdd1e8ff..01c0dbabebc9 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -6,6 +6,10 @@ AUX xjavac-ibm-1_5.patch 915 RMD160 644f32818b43896114caa247afa9c0031ea71148 SHA
 MD5 afd493b4f0610fe414ae18c4333dd016 files/xjavac-ibm-1_5.patch 915
 RMD160 644f32818b43896114caa247afa9c0031ea71148 files/xjavac-ibm-1_5.patch 915
 SHA256 efa5f9cb2669456d3b062e44da5d1fb2fca71966e94c1e21641b557c662b4de9 files/xjavac-ibm-1_5.patch 915
+AUX xjavac-more-vendors.patch 1554 RMD160 83f976aa040f07ac38f44e499bc6509545c57800 SHA1 3799be18513c41d8750a6187305f321cf6e79662 SHA256 c0e5cd4b1213b75ffc6e11ec05ce9f5e6bea562ada305d1557f6b0db01c141d9
+MD5 6c42db1b4f823b17898f2af913789684 files/xjavac-more-vendors.patch 1554
+RMD160 83f976aa040f07ac38f44e499bc6509545c57800 files/xjavac-more-vendors.patch 1554
+SHA256 c0e5cd4b1213b75ffc6e11ec05ce9f5e6bea562ada305d1557f6b0db01c141d9 files/xjavac-more-vendors.patch 1554
 DIST xjavac-20041208.tar.gz 1971 RMD160 bdee4c165275dedcfaf42fd38962a85b668d259e SHA1 be52abeadcaff8ac44c87b2b6b13cad49f583b4a SHA256 ae54e392bfe3ff5d33bc58a7e122bdae863531e235c2a553dee024e045694781
 EBUILD xjavac-20041208-r1.ebuild 1030 RMD160 0f395027363dd2d7124d11a9e87d4e3e5809b56a SHA1 1c080829dd8f3daa7a417375ad19ceb2d21ff568 SHA256 089ba590b4de419b816c9a6cf9978a12b954ebf8cc6fe6150ff2c8da73dfa373
 MD5 9a7c9b9937be5d3a90f8e6f3f73d7efb xjavac-20041208-r1.ebuild 1030
@@ -19,10 +23,14 @@ EBUILD xjavac-20041208-r3.ebuild 982 RMD160 ab57656e628f61f7bbf4640ede6881015e0c
 MD5 9daeec9e2c15b93f906d3d1149b71fb7 xjavac-20041208-r3.ebuild 982
 RMD160 ab57656e628f61f7bbf4640ede6881015e0cceef xjavac-20041208-r3.ebuild 982
 SHA256 91964267d1161194dc1e6d680bcc1deff4f3e54c1d4da3bb99202e2973e1e734 xjavac-20041208-r3.ebuild 982
-MISC ChangeLog 1841 RMD160 3e75a45dea85a93ec403db07821ea84b50da7710 SHA1 d81d2fb191c2109220fa2754623427446bf96d5d SHA256 375a5d1ca5b4e7463a77f94c88c6cefbfa3ea5c3e0e0170c348dce43a80af468
-MD5 bbe46103abf9f21813a393ce49768bbe ChangeLog 1841
-RMD160 3e75a45dea85a93ec403db07821ea84b50da7710 ChangeLog 1841
-SHA256 375a5d1ca5b4e7463a77f94c88c6cefbfa3ea5c3e0e0170c348dce43a80af468 ChangeLog 1841
+EBUILD xjavac-20041208-r4.ebuild 1029 RMD160 9abcfb5cd90c54d6198dc839a846ff31563a6dc0 SHA1 01da10f117b02d858d10e26e67cada33cd964347 SHA256 fa47fb4c3eabc92e224c593d51ad81255b5c8b3867b1c21682c49a9e361ccd67
+MD5 b4bb1c1c75159eb7b7ee3f7414d8da41 xjavac-20041208-r4.ebuild 1029
+RMD160 9abcfb5cd90c54d6198dc839a846ff31563a6dc0 xjavac-20041208-r4.ebuild 1029
+SHA256 fa47fb4c3eabc92e224c593d51ad81255b5c8b3867b1c21682c49a9e361ccd67 xjavac-20041208-r4.ebuild 1029
+MISC ChangeLog 2123 RMD160 b845aaeefe80413ebe0239fa4481e6ca75eeb60e SHA1 3a5840152f043b81a3c48c0e6b0c57534038c288 SHA256 d1d1e8e9c587aca201535e13cacd48f243a814cb9275f0657561652fe6da61b3
+MD5 2f474a0f98894bc5793cce98e0180756 ChangeLog 2123
+RMD160 b845aaeefe80413ebe0239fa4481e6ca75eeb60e ChangeLog 2123
+SHA256 d1d1e8e9c587aca201535e13cacd48f243a814cb9275f0657561652fe6da61b3 ChangeLog 2123
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -36,3 +44,6 @@ SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/di
 MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r3 241
 RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r3 241
 SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r3 241
+MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r4 241
+RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r4 241
+SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r4 241
diff --git a/dev-java/xjavac/files/digest-xjavac-20041208-r4 b/dev-java/xjavac/files/digest-xjavac-20041208-r4
new file mode 100644
index 000000000000..b7075055b4c2
--- /dev/null
+++ b/dev-java/xjavac/files/digest-xjavac-20041208-r4
@@ -0,0 +1,3 @@
+MD5 47e450883782e191e0e91c31a6dc2caf xjavac-20041208.tar.gz 1971
+RMD160 bdee4c165275dedcfaf42fd38962a85b668d259e xjavac-20041208.tar.gz 1971
+SHA256 ae54e392bfe3ff5d33bc58a7e122bdae863531e235c2a553dee024e045694781 xjavac-20041208.tar.gz 1971
diff --git a/dev-java/xjavac/files/xjavac-more-vendors.patch b/dev-java/xjavac/files/xjavac-more-vendors.patch
new file mode 100644
index 000000000000..84c2cb664a48
--- /dev/null
+++ b/dev-java/xjavac/files/xjavac-more-vendors.patch
@@ -0,0 +1,24 @@
+diff -uNr xjavac-20041208.orig/XJavac.java xjavac-20041208/XJavac.java
+--- xjavac-20041208/XJavac.java	2004-12-09 00:01:32.000000000 +0900
++++ xjavac-20041208/XJavac.java	2006-08-07 16:15:12.000000000 +0900
+@@ -66,6 +66,8 @@
+                 bcp.createPathElement().setPath(bcpMember.toString());
+                 bcpMember.replace(javaHome.length(), bcpMember.length(), "/lib/core.jar:");
+                 bcp.createPathElement().setPath(bcpMember.toString());
++                bcpMember.replace(javaHome.length(), bcpMember.length(),  "/lib/vm.jar:");
++                bcp.createPathElement().setPath(bcpMember.toString());
+                 bcpMember.replace(javaHome.length(), bcpMember.length(),  "/lib/graphics.jar:");
+                 bcp.createPathElement().setPath(bcpMember.toString());
+                 bcpMember.replace(javaHome.length(), bcpMember.length(),  "/lib/javaws.jar:");
+@@ -96,7 +98,10 @@
+             // for Apple and Blackdown: a Linux port of Sun Java
+             else if( (vendor.indexOf("SUN") >= 0) || 
+                      (vendor.indexOf("BLACKDOWN") >= 0) || 
+-                     (vendor.indexOf("APPLE") >= 0) ) {
++                     (vendor.indexOf("APPLE") >= 0) ||
++		     (vendor.indexOf("HEWLETT-PACKARD") >= 0) ||
++		     (vendor.indexOf("BEA") >= 0) ||
++	             (vendor.indexOf("FREE SOFTWARE FOUNDATION") >= 0) ) {
+                 // we're on an SUN 1.4; fiddle with the bootclasspath.
+                 // since we can't eviscerate XML-related info here,
+                 // we must use the classpath
diff --git a/dev-java/xjavac/xjavac-20041208-r4.ebuild b/dev-java/xjavac/xjavac-20041208-r4.ebuild
new file mode 100644
index 000000000000..ade7a50f2036
--- /dev/null
+++ b/dev-java/xjavac/xjavac-20041208-r4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20041208-r4.ebuild,v 1.1 2006/09/10 13:49:31 caster Exp $
+
+inherit java-pkg-2
+
+DESCRIPTION="The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4"
+RDEPEND=">=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/${P}-build.xml ./build.xml || die
+	epatch "${FILESDIR}/${PN}-ibm-1_5.patch"
+	epatch "${FILESDIR}/${PN}-more-vendors.patch"
+}
+
+src_compile() {
+	eant jar -Dclasspath=$(java-pkg_getjars ant-core)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	dodir /usr/share/ant-core/lib/
+	dosym /usr/share/${PN}-${SLOT}/lib/${PN}.jar /usr/share/ant-core/lib/
+}