diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-02-13 11:46:22 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-02-13 11:46:22 +0000 |
| commit | 4627d134183b850712481b75c66786e43e917a84 (patch) | |
| tree | 781116f8b67d5406827934227773f4383fd0b4fc /virtual | |
| parent | Update homepage (bug #354705 by Justin Lecher). (diff) | |
| download | historical-4627d134183b850712481b75c66786e43e917a84.tar.gz historical-4627d134183b850712481b75c66786e43e917a84.tar.bz2 historical-4627d134183b850712481b75c66786e43e917a84.zip | |
Reorganize the keyword-specific logic for better readability (and more verbosity). Add icedtea as a variant for ppc/ppc64
Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/jdk/ChangeLog | 8 | ||||
| -rw-r--r-- | virtual/jdk/Manifest | 4 | ||||
| -rw-r--r-- | virtual/jdk/jdk-1.6.0.ebuild | 59 |
3 files changed, 50 insertions, 21 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog index bcdab9839466..98c29549616a 100644 --- a/virtual/jdk/ChangeLog +++ b/virtual/jdk/ChangeLog @@ -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. diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest index bac0d7c4e7cf..ecb6a45c439b 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -1,4 +1,4 @@ EBUILD jdk-1.5.0.ebuild 1301 RMD160 16ce027f4cbe4f156a822cf1e4b928a90802aaea SHA1 5e90e0da64b90f9b6c2d3dfd2c954a29978d33d1 SHA256 f53d12e5f31d67fe450206aa077580719789e431a2d8266b919904d43a9ffe79 -EBUILD jdk-1.6.0.ebuild 1594 RMD160 7a5797f7a47ac926f98ca5a93f5b412c3349f56d SHA1 6e05b6c6f5dc4178a86365863758952abe74ba4e SHA256 cd6d279b8d017b87b2d850bae2c5fd7f9e997c7be6e8b239a7081e13613f38b7 -MISC ChangeLog 4735 RMD160 5de5e12d25f691ef4e1c7b04a7791ec31a773396 SHA1 9e61b26db811d103a48e10d98b5ac5a0bc95f6b4 SHA256 2faba1ca7b78c0ffa8c9dabf30f3cf0b5339b2da199e83835bc85c49f21002eb +EBUILD jdk-1.6.0.ebuild 1879 RMD160 4fefae16839be3600ccdf11ba21be548f73e4aac SHA1 693422e86c8bf3ec86dbc21b700db51e51693314 SHA256 e171df15068a29c2565b7342db9a3c0d5370e480853d447d925ab25bbb294dd2 +MISC ChangeLog 4931 RMD160 91d2f3e603521cca637f4e0dee4d477b36f65779 SHA1 9ce91924e2eec637b8ba5aebb731a1d1c77f4eef SHA256 80d496f1332ac00d87de18e70915c201d4cf79fc6d9c84bd2756c2c0394034af MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild index 1f3705e34a0a..a3d5cf32ce53 100644 --- a/virtual/jdk/jdk-1.6.0.ebuild +++ b/virtual/jdk/jdk-1.6.0.ebuild @@ -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 @@ IUSE="" # 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="" |