Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in virtual/jdk: jdk-1.5.0.ebuild jdk-1.6.0.ebuild ChangeLog
Date: Tue, 09 Feb 2010 17:23:22
Message-Id: E1Neto0-00041B-AQ@stork.gentoo.org
1 grobian 10/02/09 17:23:20
2
3 Modified: jdk-1.5.0.ebuild jdk-1.6.0.ebuild ChangeLog
4 Log:
5 Extend 'meaningful error message voodoo' to unbreak Prefix Linux and Solaris arches
6 (Portage version: 2.2.00.15320-prefix/cvs/Darwin powerpc)
7
8 Revision Changes Path
9 1.16 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.16&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild?rev=1.16&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild?r1=1.15&r2=1.16
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.15
19 retrieving revision 1.16
20 diff -u -r1.15 -r1.16
21 --- jdk-1.5.0.ebuild 5 Feb 2010 09:43:14 -0000 1.15
22 +++ jdk-1.5.0.ebuild 9 Feb 2010 17:23:19 -0000 1.16
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.15 2010/02/05 09:43:14 aballier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.5.0.ebuild,v 1.16 2010/02/09 17:23:19 grobian Exp $
28
29 DESCRIPTION="Virtual for JDK"
30 HOMEPAGE=""
31 @@ -16,9 +16,17 @@
32 # get a masked license warning for ibm-jdk-bin
33 # instead of (not useful) missing keyword warning for sun-jdk
34 # see #287615
35 +# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
36 +# invent it in the first place!
37 RDEPEND="|| (
38 amd64? ( =dev-java/sun-jdk-1.5.0* )
39 x86? ( =dev-java/sun-jdk-1.5.0* )
40 + amd64-linux? ( =dev-java/sun-jdk-1.5.0* )
41 + x86-linux? ( =dev-java/sun-jdk-1.5.0* )
42 + x64-solaris? ( =dev-java/sun-jdk-1.5.0* )
43 + x86-solaris? ( =dev-java/sun-jdk-1.5.0* )
44 + sparc-solaris? ( =dev-java/sun-jdk-1.5.0* )
45 + sparc64-solaris? ( =dev-java/sun-jdk-1.5.0* )
46 =dev-java/ibm-jdk-bin-1.5.0*
47 =dev-java/jrockit-jdk-bin-1.5.0*
48 =dev-java/apple-jdk-bin-1.5.0*
49
50
51
52 1.17 virtual/jdk/jdk-1.6.0.ebuild
53
54 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?rev=1.17&view=markup
55 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?rev=1.17&content-type=text/plain
56 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?r1=1.16&r2=1.17
57
58 Index: jdk-1.6.0.ebuild
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v
61 retrieving revision 1.16
62 retrieving revision 1.17
63 diff -u -r1.16 -r1.17
64 --- jdk-1.6.0.ebuild 26 Jan 2010 22:39:42 -0000 1.16
65 +++ jdk-1.6.0.ebuild 9 Feb 2010 17:23:19 -0000 1.17
66 @@ -1,6 +1,6 @@
67 # Copyright 1999-2010 Gentoo Foundation
68 # Distributed under the terms of the GNU General Public License v2
69 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.16 2010/01/26 22:39:42 caster Exp $
70 +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.17 2010/02/09 17:23:19 grobian Exp $
71
72 DESCRIPTION="Virtual for JDK"
73 HOMEPAGE=""
74 @@ -16,11 +16,21 @@
75 # get a masked license warning for ibm-jdk-bin
76 # instead of (not useful) missing keyword warning for sun-jdk
77 # see #287615
78 +# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
79 +# invent it in the first place!
80 RDEPEND="|| (
81 amd64? ( dev-java/icedtea6-bin )
82 x86? ( dev-java/icedtea6-bin )
83 amd64? ( =dev-java/sun-jdk-1.6.0* )
84 x86? ( =dev-java/sun-jdk-1.6.0* )
85 + amd64-linux? ( dev-java/icedtea6-bin )
86 + x86-linux? ( dev-java/icedtea6-bin )
87 + amd64-linux? ( =dev-java/sun-jdk-1.6.0* )
88 + x86-linux? ( =dev-java/sun-jdk-1.6.0* )
89 + x64-solaris? ( =dev-java/sun-jdk-1.6.0* )
90 + x86-solaris? ( =dev-java/sun-jdk-1.6.0* )
91 + sparc-solaris? ( =dev-java/sun-jdk-1.6.0* )
92 + sparc64-solaris? ( =dev-java/sun-jdk-1.6.0* )
93 =dev-java/ibm-jdk-bin-1.6.0*
94 =dev-java/hp-jdk-bin-1.6.0*
95 =dev-java/diablo-jdk-1.6.0*
96
97
98
99 1.30 virtual/jdk/ChangeLog
100
101 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/ChangeLog?rev=1.30&view=markup
102 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/ChangeLog?rev=1.30&content-type=text/plain
103 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/virtual/jdk/ChangeLog?r1=1.29&r2=1.30
104
105 Index: ChangeLog
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v
108 retrieving revision 1.29
109 retrieving revision 1.30
110 diff -u -r1.29 -r1.30
111 --- ChangeLog 5 Feb 2010 09:43:14 -0000 1.29
112 +++ ChangeLog 9 Feb 2010 17:23:19 -0000 1.30
113 @@ -1,6 +1,11 @@
114 # ChangeLog for virtual/jdk
115 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
116 -# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.29 2010/02/05 09:43:14 aballier Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.30 2010/02/09 17:23:19 grobian Exp $
118 +
119 + 09 Feb 2010; Fabian Groffen <grobian@g.o> jdk-1.5.0.ebuild,
120 + jdk-1.6.0.ebuild:
121 + Extend 'meaningful error message voodoo' to unbreak Prefix Linux and
122 + Solaris arches
123
124 05 Feb 2010; Alexis Ballier <aballier@g.o> jdk-1.5.0.ebuild:
125 remove diablo-jdk-1.5 support as it is for freebsd6 only
Report Message
Find on MARC Find on Google Groups