Sort out keywords, based on architectures really available on 10.5 for the binaries, bug #341625

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

4 files changed, 13 insertions, 8 deletions

diff --git a/dev-java/apple-jdk-bin/ChangeLog b/dev-java/apple-jdk-bin/ChangeLog
index 3021104523f7..4020eb3c07ea 100644
--- a/dev-java/apple-jdk-bin/ChangeLog
+++ b/dev-java/apple-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/apple-jdk-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/ChangeLog,v 1.1 2010/01/25 16:26:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/ChangeLog,v 1.2 2010/10/22 10:57:15 grobian Exp $
+
+  22 Oct 2010; Fabian Groffen <grobian@gentoo.org>
+  apple-jdk-bin-1.4.2.ebuild, apple-jdk-bin-1.6.0.ebuild:
+  Sort out keywords, based on architectures really available on 10.5 for the
+  binaries, bug #341625
 
 *apple-jdk-bin-1.6.0 (25 Jan 2010)
 *apple-jdk-bin-1.5.0 (25 Jan 2010)
diff --git a/dev-java/apple-jdk-bin/Manifest b/dev-java/apple-jdk-bin/Manifest
index d9aa59fddeb0..a95f5db2239f 100644
--- a/dev-java/apple-jdk-bin/Manifest
+++ b/dev-java/apple-jdk-bin/Manifest
@@ -1,8 +1,8 @@
 AUX apple-jdk-bin-1.4.env 1073 RMD160 8f3ffe67792c9b001c9081c0ee8d001edbd4fa9a SHA1 2d480a25320a9011e9e700d0df313b37601d9e6d SHA256 6768e274bf7d64b1ab7547c2872941755eff1dada70e96c848e2e1e8d12437b8
 AUX apple-jdk-bin-1.5.env 1022 RMD160 03b7290ace45a27d15b8c4a8093d5aa179e33962 SHA1 76bd72e1636692474b91f13dfebc6ccb404d847a SHA256 a4f07ffb5e3fff6c5e800a406e6e10498626aeed52c9dd662e92f0a5cac04626
 AUX apple-jdk-bin-1.6.env 1022 RMD160 64762a7bde754d0c4addb956ea2a92eccf0bd7f7 SHA1 5ada1bdce344b8797e6390b2c5d7edc93ad3e739 SHA256 5dc55cdb0f2cf366e6cb83a70bb324978fd250142451108644f09c71f1558f52
-EBUILD apple-jdk-bin-1.4.2.ebuild 1415 RMD160 2b5dba57b91dd0593e1a8a1ef4bc07185f7f3a4e SHA1 4042a45967983e3ff89da6abd012bc2ff5e126df SHA256 40b2afd27934d2546dfa71bcff5f8fcd7d7b50f007859f41a364963e4bedb295
+EBUILD apple-jdk-bin-1.4.2.ebuild 1404 RMD160 439419ff1f88addea76aa1f9f1a5850f2897a582 SHA1 ce16dc6c243a76dffff7750cf712c0c24938acf4 SHA256 985bfe54ac8c7a36ab1e7a747296512fd46644db9db2ac0afa2994f1ce73e687
 EBUILD apple-jdk-bin-1.5.0.ebuild 1415 RMD160 84374ab49172a20e9e814a9d9897dd21d4079c0b SHA1 0a9455ee779b859b4e9db409ebcdc5dede04fb36 SHA256 e7feff090edaa9ec19033f7a889643e97ed8372315b284640244a3367a5a4ba1
-EBUILD apple-jdk-bin-1.6.0.ebuild 1495 RMD160 9cd49f96d8afda1e584cecc11bef57095b6157b0 SHA1 d3bcaa2120af5bc0c139bf6560c2407a3c221d31 SHA256 33adad9b48d46fc85ffc03add8d3685210ddee8c6097f72fe69ddcdfc68f01bd
-MISC ChangeLog 756 RMD160 4eb9a65ba56bb63f3bab7eeffffcb520b57a63ff SHA1 12313747ae6042cb0dab4bee0722c2971e722780 SHA256 48a1d5b0f6bdbb4e4abdcb33f4c52cf0fe34ee270784978005a57b1c73506572
+EBUILD apple-jdk-bin-1.6.0.ebuild 1473 RMD160 3a94b94b4a6352b5aad84ba29f3029765d93ddfb SHA1 54c90daa197bd087709ce83dc9fbb483253e993c SHA256 7507a3fd75d9eab3cc5bca864ded7609e73de6673379ae98842eff7012e9d708
+MISC ChangeLog 967 RMD160 840af3793c7fbc8ba1340f8f6ea012a5bf255834 SHA1 6a8fb062b80ded5a4abc770faa4450246f4795f2 SHA256 99e64a41dc93d675d6e37c461f4dc9ca021c19b028c00ce314f05cddc50edf73
 MISC metadata.xml 160 RMD160 baab82f4bc435813cfde4796d42840882a9a4f8f SHA1 144e248704973cfad031c92a930aad01a62a2fda SHA256 27667dd7db1d188c12342624ec5ff2155717821d646e442aef9a691c65539ac4
diff --git a/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild b/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild
index abcf9482ef3c..badc03088929 100644
--- a/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild
+++ b/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild,v 1.1 2010/01/25 16:26:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/apple-jdk-bin-1.4.2.ebuild,v 1.2 2010/10/22 10:57:15 grobian Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Links to Apple's version of Sun's J2SE Development Kit"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
 SLOT="1.4"
 LICENSE="as-is"
-KEYWORDS="-* ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="-* ~ppc-macos ~x86-macos"
 
 JAVA_PROVIDE="jdbc-stdext"
 
diff --git a/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild b/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild
index 6ec47a303d2d..5902b591ac27 100644
--- a/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild
+++ b/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild,v 1.1 2010/01/25 16:26:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild,v 1.2 2010/10/22 10:57:15 grobian Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Links to Apple's version of Sun's J2SE Development Kit"
 HOMEPAGE="http://java.sun.com/j2se/1.6.0/"
 SLOT="1.6"
 LICENSE="as-is"
-KEYWORDS="-* ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="-* ~x64-macos"
 
 JAVA_PROVIDE="jdbc-stdext"