diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-01-23 12:07:07 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-01-23 12:07:07 +0000 |
| commit | a5edeed50e3b4f8a78e128cd39f6d1851e5636eb (patch) | |
| tree | 386f9f58e964fb624c41d767f3f9d2592e1c49b8 /dev-java/xjavac | |
| parent | Missing line for prev. commit. (diff) | |
| download | gentoo-2-a5edeed50e3b4f8a78e128cd39f6d1851e5636eb.tar.gz gentoo-2-a5edeed50e3b4f8a78e128cd39f6d1851e5636eb.tar.bz2 gentoo-2-a5edeed50e3b4f8a78e128cd39f6d1851e5636eb.zip | |
Treat diablo-jdk from the freebsd foundation as sun and other jdks, bug #301067
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/xjavac')
| -rw-r--r-- | dev-java/xjavac/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/xjavac/files/xjavac-more-vendors.patch | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/dev-java/xjavac/ChangeLog b/dev-java/xjavac/ChangeLog index 5869ef1686f8..2ff75a9bf1ee 100644 --- a/dev-java/xjavac/ChangeLog +++ b/dev-java/xjavac/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/xjavac # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.30 2010/01/03 21:48:36 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.31 2010/01/23 12:07:04 aballier Exp $ + + 23 Jan 2010; Alexis Ballier <aballier@gentoo.org> + files/xjavac-more-vendors.patch: + Treat diablo-jdk from the freebsd foundation as sun and other jdks, bug + #301067 03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> xjavac-20041208-r5.ebuild: diff --git a/dev-java/xjavac/files/xjavac-more-vendors.patch b/dev-java/xjavac/files/xjavac-more-vendors.patch index 84c2cb664a48..f2e94f3e1e29 100644 --- a/dev-java/xjavac/files/xjavac-more-vendors.patch +++ b/dev-java/xjavac/files/xjavac-more-vendors.patch @@ -1,6 +1,5 @@ -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 +--- xjavac-20041208/XJavac.java.vanilla 2010-01-15 11:08:48 +0100 ++++ xjavac-20041208/XJavac.java 2010-01-15 11:09:31 +0100 @@ -66,6 +66,8 @@ bcp.createPathElement().setPath(bcpMember.toString()); bcpMember.replace(javaHome.length(), bcpMember.length(), "/lib/core.jar:"); @@ -10,7 +9,7 @@ diff -uNr xjavac-20041208.orig/XJavac.java xjavac-20041208/XJavac.java 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 @@ +@@ -96,7 +98,11 @@ // for Apple and Blackdown: a Linux port of Sun Java else if( (vendor.indexOf("SUN") >= 0) || (vendor.indexOf("BLACKDOWN") >= 0) || @@ -18,7 +17,8 @@ diff -uNr xjavac-20041208.orig/XJavac.java xjavac-20041208/XJavac.java + (vendor.indexOf("APPLE") >= 0) || + (vendor.indexOf("HEWLETT-PACKARD") >= 0) || + (vendor.indexOf("BEA") >= 0) || -+ (vendor.indexOf("FREE SOFTWARE FOUNDATION") >= 0) ) { ++ (vendor.indexOf("FREE SOFTWARE FOUNDATION") >= 0) || ++ (vendor.indexOf("THE FREEBSD 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 |