From 493686143db348e8f4a5b86fbdb32c4e49329378 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 17 Oct 2012 16:06:46 +0200 Subject: [PATCH] add arm support (Portage version: 2.2.0_alpha123/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit) --- virtual/jdk/ChangeLog | 9 +++- virtual/jdk/Manifest | 7 +-- virtual/jdk/jdk-1.6.0-r1.ebuild | 47 ++++++++++++++++++++ virtual/jdk/jdk-1.6.0.ebuild | 79 --------------------------------- virtual/jdk/jdk-1.7.0.ebuild | 19 ++++++++ 5 files changed, 78 insertions(+), 83 deletions(-) create mode 100644 virtual/jdk/jdk-1.6.0-r1.ebuild delete mode 100644 virtual/jdk/jdk-1.6.0.ebuild create mode 100644 virtual/jdk/jdk-1.7.0.ebuild diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog index 91c020d..fbea7c3 100644 --- a/virtual/jdk/ChangeLog +++ b/virtual/jdk/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for virtual/jdk -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.30 2010/02/09 17:23:19 grobian Exp $ +*jdk-1.7.0 (17 Oct 2012) +*jdk-1.6.0-r1 (17 Oct 2012) + + 17 Oct 2012; Mario Fetka -jdk-1.6.0.ebuild, + +jdk-1.6.0-r1.ebuild, +jdk-1.7.0.ebuild: + add arm support + 11 Dec 2011; Mario Fetka jdk-1.6.0.ebuild: add gcj-jdk to arm diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest index 4b63f5d..661350c 100644 --- a/virtual/jdk/Manifest +++ b/virtual/jdk/Manifest @@ -1,3 +1,4 @@ -EBUILD jdk-1.6.0.ebuild 2144 RMD160 f293db97aaabba7ebafab1e826783147ab4f8fcf SHA1 7278646d11d7bd391c6833fb5e3bf6fd751aa743 SHA256 e4604eeefa661d3a3880c84b34d8f66ddd23330e9f2bc95703084107e3dd96ee -MISC ChangeLog 4657 RMD160 f5ed7bdbd6d6c716b24a68cabf2b4f0f3a2df3a5 SHA1 551c14ecfa23e191d77a5245fa009a40f3c0b747 SHA256 9b9b7b54e5bfae9e0a99c1bf1f10974928a6146541cf44410c6cf5c289c5c19d -MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb +EBUILD jdk-1.6.0-r1.ebuild 1566 SHA256 c0c697b8c2774a650356c1f58db942bcd3b3d363ea187ff683a66291b24b21a7 SHA512 0349c9b0189a547d182b280a9f3d68a53b01c504501591e33cb6e85b79ad4ee321769505362cbfa9ae3f34c38cabaa601ef72656e07b3659f7e59b1c455adeed WHIRLPOOL d28da80d57a71b0a2259afae02801cc4d61d149d1f3340782bc3e131df8c5094c400a98d5dd5bd356d433e0e0522929e01e59bf18a47f727b8bc87872c902ebf +EBUILD jdk-1.7.0.ebuild 524 SHA256 ac6c1b9c7c48d6cc8cafbbf59d6d5311e475bde4c3bf7b2188b2bcf54952bd75 SHA512 22faf428ce03e644ca3acc8cf37ee9934231324810001dc52cc9610995848fa56ae8ba41d9ff3a60d399797f48cfabcec490c620e9cf33b7a78c650926829241 WHIRLPOOL 9cbb70aa716ee6b6c1398f69faa69b7a9ea5fae70c54fe712d1ed3c56c2f7b4e81f8145fac7e676f767a3c13902a65f1e3e052fc261a5c4a90470d57894cc2ce +MISC ChangeLog 4843 SHA256 6159bf884ed157e8264841d5e2cab05d5c90862c7d7f19114b3ae7be2e7553d6 SHA512 ee03fe28db2e803dc9c68e805a5c11d6ec795afbbf426fae536c75e6a9a7d2422a77ed86293e148b9484f0eaf13786086811b9080384f14121c675f00db02912 WHIRLPOOL 3a3c409e458cd923af95b4db42e51d2ff34f4111035ceb06c7c5fcbbd9daf513a203cee2f29d683b69e4c5c70b3a1837a0d591d710b61f0813f0df47ac48404b +MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26 diff --git a/virtual/jdk/jdk-1.6.0-r1.ebuild b/virtual/jdk/jdk-1.6.0-r1.ebuild new file mode 100644 index 0000000..403e1c3 --- /dev/null +++ b/virtual/jdk/jdk-1.6.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r1.ebuild,v 1.5 2012/07/09 20:43:47 ago Exp $ + +EAPI="4" + +DESCRIPTION="Virtual for JDK" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="1.6" +KEYWORDS="arm amd64 ~ia64 ~ppc ~ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +# The keyword voodoo below is needed to work around confilcting masking types +# and for having arch specific preferences. +# All VMs must be listed in the no use flag enabled case which reflects the +# default order for amd64 and x86. + +# This is that ppc(64) users will get a masked license warning for ibm-jdk-bin +# instead of (not useful) missing keyword warning for sun-jdk. #287615 +PPC_OPTS="|| ( + =dev-java/ibm-jdk-bin-1.6.0* + =dev-java/icedtea-6* )" + +# Prefix defaults - prefer sun-jdk over icedtea +PREFIX_OPTS="|| ( + =dev-java/icedtea-bin-6* + =dev-java/icedtea-bin-1* + =dev-java/sun-jdk-1.6.0* )" + +# icedtea-bin-1* is old versioning scheme of icedtea-bin-6* +RDEPEND="|| ( + ppc? ( ${PPC_OPTS} ) + ppc64? ( ${PPC_OPTS} ) + prefix? ( ${PREFIX_OPTS} ) + =dev-java/icedtea-bin-6* + =dev-java/icedtea-bin-1* + =dev-java/icedtea-6* + =dev-java/sun-jdk-1.6.0* + =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* )" diff --git a/virtual/jdk/jdk-1.6.0.ebuild b/virtual/jdk/jdk-1.6.0.ebuild deleted file mode 100644 index c0458c4..0000000 --- a/virtual/jdk/jdk-1.6.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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.23 2011/11/07 16:05:27 caster Exp $ - -DESCRIPTION="Virtual for JDK" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="1.6" -KEYWORDS="amd64 arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -# The keyword voodoo below is needed so that ppc(64) users will -# get a masked license warning for ibm-jdk-bin -# instead of (not useful) missing keyword warning for sun-jdk -# see #287615 -# note that this "voodoo" is pretty annoying for Prefix, and that we didn't -# invent it in the first place! - -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* -" - -ARM_OPTS="|| ( - =dev-java/gcj-jdk-4.6* - =dev-java/icedtea-bin-6* - =dev-java/icedtea-6* - =dev-java/sun-jdk-1.6.0* - ${COMMON_INC} - )" - -# icedtea-bin-1* is old versioning scheme of icedtea-bin-6* -X86_OPTS="|| ( - =dev-java/icedtea-bin-6* - =dev-java/icedtea-bin-1* - =dev-java/icedtea-6* - =dev-java/sun-jdk-1.6.0* - ${COMMON_INC} - )" - -X86_PREFIX_OPTS="|| ( - =dev-java/icedtea-bin-6* - =dev-java/icedtea-bin-1* - =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} ) - arm? ( ${ARM_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? ( !arm? ( !x86? ( !ppc? ( !ppc64? ( !amd64-linux? ( !x86-linux? ( !x64-solaris? ( !x86-solaris? ( !sparc-solaris? ( !sparc64-solaris? ( - ${COMMON_OPTS} - ) ) ) ) ) ) ) ) ) ) ) - )" -DEPEND="" diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild new file mode 100644 index 0000000..bbbb503 --- /dev/null +++ b/virtual/jdk/jdk-1.7.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.6 2012/04/15 18:27:18 vapier Exp $ + +DESCRIPTION="Virtual for JDK" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="1.7" +KEYWORDS="~arm ~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="|| ( + =dev-java/icedtea-bin-7* + =dev-java/icedtea-7* + =dev-java/oracle-jdk-bin-1.7.0* + )" +DEPEND=""