diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/xjavac/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/xjavac/files/digest-xjavac-20041208-r3 | 3 | ||||
| -rw-r--r-- | dev-java/xjavac/files/xjavac-20041208-build.xml | 1 | ||||
| -rw-r--r-- | dev-java/xjavac/files/xjavac-ibm-1_5.patch | 20 | ||||
| -rw-r--r-- | dev-java/xjavac/xjavac-20041208-r3.ebuild | 33 |
5 files changed, 65 insertions, 1 deletions
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 <nelchael@gentoo.org> + +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ò <flameeyes@gentoo.org> xjavac-20041208-r2.ebuild: 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 @@ <mkdir dir="${build.dir}" /> <javac srcdir="${src.dir}" destdir="${build.dir}" + classpath="${classpath}" source="${target.jdk}" target="${target.jdk}"/> </target> 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/ +} |