From: "Vlastimil Babka (caster)" <caster@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in virtual/jdk: jdk-1.6.0.ebuild ChangeLog
Date: Sun, 13 Feb 2011 11:46:22 +0000 (UTC) [thread overview]
Message-ID: <20110213114622.DC40C20054@flycatcher.gentoo.org> (raw)
caster 11/02/13 11:46:22
Modified: jdk-1.6.0.ebuild ChangeLog
Log:
Reorganize the keyword-specific logic for better readability (and more verbosity). Add icedtea as a variant for ppc/ppc64
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Revision Changes Path
1.19 virtual/jdk/jdk-1.6.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild?r1=1.18&r2=1.19
Index: jdk-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jdk-1.6.0.ebuild 4 Mar 2010 23:47:11 -0000 1.18
+++ jdk-1.6.0.ebuild 13 Feb 2011 11:46:22 -0000 1.19
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.18 2010/03/04 23:47:11 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0.ebuild,v 1.19 2011/02/13 11:46:22 caster Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE=""
@@ -18,26 +18,51 @@
# see #287615
# note that this "voodoo" is pretty annoying for Prefix, and that we didn't
# invent it in the first place!
-RDEPEND="|| (
- amd64? ( dev-java/icedtea6-bin )
- x86? ( dev-java/icedtea6-bin )
- amd64-linux? ( dev-java/icedtea6-bin )
- x86-linux? ( dev-java/icedtea6-bin )
- amd64? ( =dev-java/icedtea-6* )
- x86? ( =dev-java/icedtea-6* )
- amd64? ( =dev-java/sun-jdk-1.6.0* )
- x86? ( =dev-java/sun-jdk-1.6.0* )
- amd64-linux? ( =dev-java/sun-jdk-1.6.0* )
- x86-linux? ( =dev-java/sun-jdk-1.6.0* )
- x64-solaris? ( =dev-java/sun-jdk-1.6.0* )
- x86-solaris? ( =dev-java/sun-jdk-1.6.0* )
- sparc-solaris? ( =dev-java/sun-jdk-1.6.0* )
- sparc64-solaris? ( =dev-java/sun-jdk-1.6.0* )
+
+COMMON_INC="
=dev-java/ibm-jdk-bin-1.6.0*
=dev-java/hp-jdk-bin-1.6.0*
=dev-java/diablo-jdk-1.6.0*
=dev-java/soylatte-jdk-bin-1.0*
=dev-java/apple-jdk-bin-1.6.0*
=dev-java/winjdk-bin-1.6.0*
+"
+
+X86_OPTS="|| (
+ dev-java/icedtea6-bin
+ =dev-java/icedtea-6*
+ =dev-java/sun-jdk-1.6.0*
+ ${COMMON_INC}
+ )"
+
+X86_PREFIX_OPTS="|| (
+ dev-java/icedtea6-bin
+ =dev-java/sun-jdk-1.6.0*
+ ${COMMON_INC}
+ )"
+
+PPC_OPTS="|| (
+ =dev-java/ibm-jdk-bin-1.6.0*
+ =dev-java/icedtea-6*
+ )"
+
+COMMON_OPTS="|| (
+ ${COMMON_INC}
+ )"
+
+RDEPEND="|| (
+ amd64? ( ${X86_OPTS} )
+ x86? ( ${X86_OPTS} )
+ ppc? ( ${PPC_OPTS} )
+ ppc64? ( ${PPC_OPTS} )
+ amd64-linux? ( ${X86_PREFIX_OPTS} )
+ x86-linux? ( ${X86_PREFIX_OPTS} )
+ x64-solaris? ( ${X86_PREFIX_OPTS} )
+ x86-solaris? ( ${X86_PREFIX_OPTS} )
+ sparc-solaris? ( ${X86_PREFIX_OPTS} )
+ sparc64-solaris? ( ${X86_PREFIX_OPTS} )
+ !amd64? ( !x86? ( !ppc? ( !ppc64? ( !amd64-linux? ( !x86-linux? ( !x64-solaris? ( !x86-solaris? ( !sparc-solaris? ( !sparc64-solaris? (
+ ${COMMON_OPTS}
+ ) ) ) ) ) ) ) ) ) )
)"
DEPEND=""
1.35 virtual/jdk/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/virtual/jdk/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 14 Nov 2010 01:08:00 -0000 1.34
+++ ChangeLog 13 Feb 2011 11:46:22 -0000 1.35
@@ -1,6 +1,10 @@
# ChangeLog for virtual/jdk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.34 2010/11/14 01:08:00 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.35 2011/02/13 11:46:22 caster Exp $
+
+ 13 Feb 2011; Vlastimil Babka <caster@gentoo.org> jdk-1.6.0.ebuild:
+ Reorganize the keyword-specific logic for better readability (and more
+ verbosity). Add icedtea as a variant for ppc/ppc64
14 Nov 2010; Vlastimil Babka <caster@gentoo.org> jdk-1.5.0.ebuild:
Add gcj-jdk to 1.5 list.
next reply other threads:[~2011-02-13 11:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-13 11:46 Vlastimil Babka (caster) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-11-07 16:05 [gentoo-commits] gentoo-x86 commit in virtual/jdk: jdk-1.6.0.ebuild ChangeLog Vlastimil Babka (caster)
2011-10-30 14:08 Vlastimil Babka (caster)
2011-05-03 14:02 Fabian Groffen (grobian)
2010-03-04 23:47 Vlastimil Babka (caster)
2010-01-13 14:08 Michael Haubenwallner (haubi)
2009-07-05 5:10 Alistair Bush (ali_bush)
2008-12-24 22:28 Vlastimil Babka (caster)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110213114622.DC40C20054@flycatcher.gentoo.org \
--to=caster@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox