| 1 |
caster 10/01/26 22:39:43 |
| 2 |
|
| 3 |
Modified: jdk-1.5.0.ebuild jdk-1.6.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Make dependencies on icedtea6-bin and sun-jdk apply only on x86/amd64 so that ppc(64) users get more meaningful error for masked licenses of ibm-jdk-bin, as pointed out in #287615. |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.14 virtual/jdk/jdk-1.5.0.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild?rev=1.14&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild?rev=1.14&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild?r1=1.13&r2=1.14 |
| 14 |
|
| 15 |
Index: jdk-1.5.0.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v |
| 18 |
retrieving revision 1.13 |
| 19 |
retrieving revision 1.14 |
| 20 |
diff -u -r1.13 -r1.14 |
| 21 |
--- jdk-1.5.0.ebuild 25 Jan 2010 16:09:09 -0000 1.13 |
| 22 |
+++ jdk-1.5.0.ebuild 26 Jan 2010 22:39:42 -0000 1.14 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.13 2010/01/25 16:09:09 caster Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.14 2010/01/26 22:39:42 caster Exp $ |
| 28 |
|
| 29 |
DESCRIPTION="Virtual for JDK" |
| 30 |
HOMEPAGE="" |
| 31 |
@@ -12,8 +12,13 @@ |
| 32 |
IUSE="" |
| 33 |
|
| 34 |
# Keep this list in sync with java-virtuals/jmx |
| 35 |
+# The keyword voodoo below is needed so that ppc(64) users will |
| 36 |
+# get a masked license warning for ibm-jdk-bin |
| 37 |
+# instead of (not useful) missing keyword warning for sun-jdk |
| 38 |
+# see #287615 |
| 39 |
RDEPEND="|| ( |
| 40 |
- =dev-java/sun-jdk-1.5.0* |
| 41 |
+ amd64? ( =dev-java/sun-jdk-1.5.0* ) |
| 42 |
+ x86? ( =dev-java/sun-jdk-1.5.0* ) |
| 43 |
=dev-java/ibm-jdk-bin-1.5.0* |
| 44 |
=dev-java/jrockit-jdk-bin-1.5.0* |
| 45 |
=dev-java/diablo-jdk-1.5.0* |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.16 virtual/jdk/jdk-1.6.0.ebuild |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?rev=1.16&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?rev=1.16&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?r1=1.15&r2=1.16 |
| 54 |
|
| 55 |
Index: jdk-1.6.0.ebuild |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v |
| 58 |
retrieving revision 1.15 |
| 59 |
retrieving revision 1.16 |
| 60 |
diff -u -r1.15 -r1.16 |
| 61 |
--- jdk-1.6.0.ebuild 13 Jan 2010 14:08:58 -0000 1.15 |
| 62 |
+++ jdk-1.6.0.ebuild 26 Jan 2010 22:39:42 -0000 1.16 |
| 63 |
@@ -1,6 +1,6 @@ |
| 64 |
# Copyright 1999-2010 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.15 2010/01/13 14:08:58 haubi Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.16 2010/01/26 22:39:42 caster Exp $ |
| 68 |
|
| 69 |
DESCRIPTION="Virtual for JDK" |
| 70 |
HOMEPAGE="" |
| 71 |
@@ -12,9 +12,15 @@ |
| 72 |
IUSE="" |
| 73 |
|
| 74 |
# Keeps this and java-virtuals/jaf in sync |
| 75 |
+# The keyword voodoo below is needed so that ppc(64) users will |
| 76 |
+# get a masked license warning for ibm-jdk-bin |
| 77 |
+# instead of (not useful) missing keyword warning for sun-jdk |
| 78 |
+# see #287615 |
| 79 |
RDEPEND="|| ( |
| 80 |
- dev-java/icedtea6-bin |
| 81 |
- =dev-java/sun-jdk-1.6.0* |
| 82 |
+ amd64? ( dev-java/icedtea6-bin ) |
| 83 |
+ x86? ( dev-java/icedtea6-bin ) |
| 84 |
+ amd64? ( =dev-java/sun-jdk-1.6.0* ) |
| 85 |
+ x86? ( =dev-java/sun-jdk-1.6.0* ) |
| 86 |
=dev-java/ibm-jdk-bin-1.6.0* |
| 87 |
=dev-java/hp-jdk-bin-1.6.0* |
| 88 |
=dev-java/diablo-jdk-1.6.0* |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.28 virtual/jdk/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/ChangeLog?rev=1.28&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/ChangeLog?rev=1.28&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/ChangeLog?r1=1.27&r2=1.28 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v |
| 101 |
retrieving revision 1.27 |
| 102 |
retrieving revision 1.28 |
| 103 |
diff -u -r1.27 -r1.28 |
| 104 |
--- ChangeLog 25 Jan 2010 16:09:09 -0000 1.27 |
| 105 |
+++ ChangeLog 26 Jan 2010 22:39:42 -0000 1.28 |
| 106 |
@@ -1,6 +1,12 @@ |
| 107 |
# ChangeLog for virtual/jdk |
| 108 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.27 2010/01/25 16:09:09 caster Exp $ |
| 110 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.28 2010/01/26 22:39:42 caster Exp $ |
| 111 |
+ |
| 112 |
+ 26 Jan 2010; Vlastimil Babka <caster@g.o> jdk-1.5.0.ebuild, |
| 113 |
+ jdk-1.6.0.ebuild: |
| 114 |
+ Make dependencies on icedtea6-bin and sun-jdk apply only on x86/amd64 so |
| 115 |
+ that ppc(64) users get more meaningful error for masked licenses of |
| 116 |
+ ibm-jdk-bin, as pointed out in #287615. |
| 117 |
|
| 118 |
25 Jan 2010; Vlastimil Babka <caster@g.o> jdk-1.4.2.ebuild, |
| 119 |
jdk-1.5.0.ebuild: |
Archives