Add support for Solaris, added Prefix keywords

Package-Manager: portage-2.2.01.19572-prefix/cvs/SunOS i386

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index dcf0e04eec4c02b50d4f9e5435fa1b762593804d..c4eafa2883e743ca7e0575a4c738b0367a4f520b 100644 (file)
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.7 2011/11/21 10:28:26 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.8 2011/12/15 21:03:53 grobian Exp $
+
+  15 Dec 2011; Fabian Groffen <grobian@gentoo.org>
+  oracle-jdk-bin-1.7.0.1-r2.ebuild:
+  Add support for Solaris, added Prefix keywords
 
   21 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
   oracle-jdk-bin-1.7.0.1-r1.ebuild, oracle-jdk-bin-1.7.0.1-r2.ebuild:

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
index d0efee5109808acc2fa6645def539d17914c654d..74ce4434d0efdc196ab558ff7715bc0da53bd01a 100644 (file)
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild,v 1.2 2011/11/21 10:28:26 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild,v 1.3 2011/12/15 21:03:53 grobian Exp $
 
 EAPI="4"
 
@@ -13,6 +13,10 @@ S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
 
 X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
 AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
+SOL_X86_AT="jdk-${MY_PV}-solaris-i586.tar.gz"
+SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.tar.gz"
+SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.tar.gz"
+SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
 
 # check the URIs when bumping, no idea about their stability yet
 JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.html"
@@ -25,10 +29,14 @@ DESCRIPTION="Oracle's Java SE Development Kit"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="x86? ( ${X86_AT} )
        amd64? ( ${AMD64_AT} )
+       x86-solaris? ( ${SOL_X86_AT} )
+       x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} )
+       sparc-solaris? ( ${SOL_SPARC_AT} )
+       sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} )
        jce? ( ${JCE_FILE} )"
 SLOT="1.7"
 LICENSE="Oracle-BCLA-JavaSE"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="fetch strip"
 IUSE="X alsa derby doc examples jce nsplugin"
 
@@ -56,6 +64,14 @@ pkg_nofetch() {
                AT=${X86_AT}
        elif use amd64; then
                AT=${AMD64_AT}
+       elif use x86-solaris; then
+               AT=${SOL_X86_AT}
+       elif use x64-solaris; then
+               AT="${SOL_X86_AT} and ${SOL_AMD64_AT}"
+       elif use sparc-solaris; then
+               AT=${SOL_SPARC_AT}
+       elif use sparc64-solaris; then
+               AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
        fi
 
        einfo "Please download ${AT} from:"