From 46ce87710b9e1020d67a6be008e83b9882b29018 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Sat, 5 Aug 2006 20:15:51 +0000 Subject: [PATCH] Apply a patch for IBM JDK, see bug #142692. Package-Manager: portage-2.1.1_pre4-r3 --- dev-java/xjavac/ChangeLog | 9 ++++- dev-java/xjavac/Manifest | 35 ++++++++++++------- .../xjavac/files/digest-xjavac-20041208-r3 | 3 ++ .../xjavac/files/xjavac-20041208-build.xml | 1 + dev-java/xjavac/files/xjavac-ibm-1_5.patch | 20 +++++++++++ dev-java/xjavac/xjavac-20041208-r3.ebuild | 33 +++++++++++++++++ 6 files changed, 88 insertions(+), 13 deletions(-) create mode 100644 dev-java/xjavac/files/digest-xjavac-20041208-r3 create mode 100644 dev-java/xjavac/files/xjavac-ibm-1_5.patch create mode 100644 dev-java/xjavac/xjavac-20041208-r3.ebuild diff --git a/dev-java/xjavac/ChangeLog b/dev-java/xjavac/ChangeLog index ba40d70ec6a2..9b0512d78a36 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.10 2006/07/23 00:46:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.11 2006/08/05 20:15:51 nelchael Exp $ + +*xjavac-20041208-r3 (05 Aug 2006) + + 05 Aug 2006; Krzysiek Pawlik + +files/xjavac-ibm-1_5.patch, files/xjavac-20041208-build.xml, + +xjavac-20041208-r3.ebuild: + Apply a patch for IBM JDK, see bug #142692. 23 Jul 2006; Diego Pettenò xjavac-20041208-r2.ebuild: diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest index 44bdb1492bb8..58f3cb1c0aa7 100644 --- a/dev-java/xjavac/Manifest +++ b/dev-java/xjavac/Manifest @@ -1,10 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX xjavac-20041208-build.xml 1060 RMD160 6104b382e88295c633a4fbff9dae0abaa77a1f8a SHA1 3825aeb265500af555e2c09ead67c696115e4d4b SHA256 a1f060b9dd8e87bd6706f1ed4f53d3ce8e438e827e8c52a863b4abfb9302f1de -MD5 be3862beac63be44381318b441bc3ac6 files/xjavac-20041208-build.xml 1060 -RMD160 6104b382e88295c633a4fbff9dae0abaa77a1f8a files/xjavac-20041208-build.xml 1060 -SHA256 a1f060b9dd8e87bd6706f1ed4f53d3ce8e438e827e8c52a863b4abfb9302f1de files/xjavac-20041208-build.xml 1060 +AUX xjavac-20041208-build.xml 1088 RMD160 40b56a0816001a3b80816c785620ac30dda5f053 SHA1 110534c27b7801bd1946d04a035700ec6702cb38 SHA256 efed4720ae40840e8c8715c6925dc9fe54100202e7a710fd3998062d81e4e81b +MD5 6fe9f96a234f0ef0c00816978f225959 files/xjavac-20041208-build.xml 1088 +RMD160 40b56a0816001a3b80816c785620ac30dda5f053 files/xjavac-20041208-build.xml 1088 +SHA256 efed4720ae40840e8c8715c6925dc9fe54100202e7a710fd3998062d81e4e81b files/xjavac-20041208-build.xml 1088 +AUX xjavac-ibm-1_5.patch 915 RMD160 644f32818b43896114caa247afa9c0031ea71148 SHA1 ea32f2295ed4c9043d0f2c8b8ec0588c6ead4696 SHA256 efa5f9cb2669456d3b062e44da5d1fb2fca71966e94c1e21641b557c662b4de9 +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 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 @@ -14,10 +18,14 @@ EBUILD xjavac-20041208-r2.ebuild 896 RMD160 84242b92b23ac778ee5003e28543c69ce404 MD5 e3e0cbebb4fbceaede15a7fce203360b xjavac-20041208-r2.ebuild 896 RMD160 84242b92b23ac778ee5003e28543c69ce4049215 xjavac-20041208-r2.ebuild 896 SHA256 c6b8675ccfe6007fdc42b0eb72b4f146178ca6b34b3c5ca8ba1532574f9909b5 xjavac-20041208-r2.ebuild 896 -MISC ChangeLog 1519 RMD160 aaea6d7dc5706ca739b08e0459d14b0c6794367c SHA1 d2e35565210e45c10440099c961180a7b5b5f14a SHA256 96c22cddf6d97f3dbac37eff825d6b6272bf2c660929e2694706c96f6cf7e9d4 -MD5 086457d8a1ddabdafeece73ffce6a0fa ChangeLog 1519 -RMD160 aaea6d7dc5706ca739b08e0459d14b0c6794367c ChangeLog 1519 -SHA256 96c22cddf6d97f3dbac37eff825d6b6272bf2c660929e2694706c96f6cf7e9d4 ChangeLog 1519 +EBUILD xjavac-20041208-r3.ebuild 978 RMD160 38f198dc8706ec9e43a04eb75519234fea50d915 SHA1 56223e8f7cc6dad7a2015f25a1c4097703f80fe3 SHA256 1aad5aca0fff2abc40b13d06ba61f9a21443444d1f4a51e231b29b6eb7a4dd86 +MD5 532e3f56323a3954093d51a2fb36041a xjavac-20041208-r3.ebuild 978 +RMD160 38f198dc8706ec9e43a04eb75519234fea50d915 xjavac-20041208-r3.ebuild 978 +SHA256 1aad5aca0fff2abc40b13d06ba61f9a21443444d1f4a51e231b29b6eb7a4dd86 xjavac-20041208-r3.ebuild 978 +MISC ChangeLog 1747 RMD160 0b154e9ad44ac10e43b3adb0b99e04030b590f5e SHA1 bc64b556df43d93a3016adcb98c7335828020af8 SHA256 68170be911759a334cca261c66c7e72ccb2f55436f7874598cb326d7c6e1d3c0 +MD5 70f0976563993f2cc50189d18305aef3 ChangeLog 1747 +RMD160 0b154e9ad44ac10e43b3adb0b99e04030b590f5e ChangeLog 1747 +SHA256 68170be911759a334cca261c66c7e72ccb2f55436f7874598cb326d7c6e1d3c0 ChangeLog 1747 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -28,10 +36,13 @@ SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/di MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r2 241 RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r2 241 SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r2 241 +MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r3 241 +RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r3 241 +SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r3 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEwsb0AiZjviIA2XgRAoqgAKCIpb7Mq3ViyS1GOyDFZCgualV7qgCfbRDZ -p4EvrnwplUHCO4+sciAg8q4= -=rZKg +iD8DBQFE1PyFgo/w9rxVVVERAiBJAJ9+Zxe+aGrur/f0HZWJA3jkGGZ5PgCgi8Ct +DupH4T+GRSl+UfwKgVUApEQ= +=i5Oo -----END PGP SIGNATURE----- diff --git a/dev-java/xjavac/files/digest-xjavac-20041208-r3 b/dev-java/xjavac/files/digest-xjavac-20041208-r3 new file mode 100644 index 000000000000..b7075055b4c2 --- /dev/null +++ b/dev-java/xjavac/files/digest-xjavac-20041208-r3 @@ -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-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml index efd5f6f0ae47..5c9a466ca8e8 100644 --- a/dev-java/xjavac/files/xjavac-20041208-build.xml +++ b/dev-java/xjavac/files/xjavac-20041208-build.xml @@ -22,6 +22,7 @@ diff --git a/dev-java/xjavac/files/xjavac-ibm-1_5.patch b/dev-java/xjavac/files/xjavac-ibm-1_5.patch new file mode 100644 index 000000000000..9a4148f233e0 --- /dev/null +++ b/dev-java/xjavac/files/xjavac-ibm-1_5.patch @@ -0,0 +1,20 @@ +--- XJavac.java.vanilla 2006-08-05 21:43:45.000000000 +0200 ++++ XJavac.java 2006-08-05 21:45:27.000000000 +0200 +@@ -57,7 +57,7 @@ + } + // this is supposed to be provided by all JVM's from time immemorial + String vendor = ((String)props.get("java.vendor")).toUpperCase(Locale.ENGLISH); +- if(vendor.indexOf("IBM") >= 0){ ++ if((vendor.indexOf("IBM") >= 0) && (isJDK14())){ + // we're on an IBM 1.4; fiddle with the bootclasspath. + Path bcp = createBootclasspath(); + String javaHome = System.getProperty("java.home"); +@@ -131,4 +131,8 @@ + !version.equals(JavaEnvUtils.JAVA_1_1) && + !version.equals(JavaEnvUtils.JAVA_1_0)); + } ++ private boolean isJDK14() { ++ final String version = JavaEnvUtils.getJavaVersion(); ++ return version.equals(JavaEnvUtils.JAVA_1_4); ++ } + } diff --git a/dev-java/xjavac/xjavac-20041208-r3.ebuild b/dev-java/xjavac/xjavac-20041208-r3.ebuild new file mode 100644 index 000000000000..13054da51ddb --- /dev/null +++ b/dev-java/xjavac/xjavac-20041208-r3.ebuild @@ -0,0 +1,33 @@ +# 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-r3.ebuild,v 1.1 2006/08/05 20:15:51 nelchael 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 ~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" +} + +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/ +} -- 2.26.2