Block incompatible ibm jdk, fixes bug #446273.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 28 insertions, 26 deletions

diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index a7c8b057d175..c15d8c8a4179 100644
--- a/kde-base/krossjava/ChangeLog
+++ b/kde-base/krossjava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.154 2013/11/05 22:22:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.155 2013/11/23 17:55:20 johu Exp $
+
+  23 Nov 2013; Johannes Huber <johu@gentoo.org> krossjava-4.11.2.ebuild,
+  krossjava-4.11.3.ebuild:
+  Block incompatible ibm jdk, fixes bug #446273.
 
 *krossjava-4.11.3 (05 Nov 2013)
 
diff --git a/kde-base/krossjava/Manifest b/kde-base/krossjava/Manifest
index bd747a609b42..c7993c469d6d 100644
--- a/kde-base/krossjava/Manifest
+++ b/kde-base/krossjava/Manifest
@@ -5,26 +5,24 @@ DIST kross-interpreters-4.10.5.tar.xz 133824 SHA256 ea638e06cd2ed11db786113253f9
 DIST kross-interpreters-4.11.2.tar.xz 134208 SHA256 afe9524c93f52ea71aac9ee9beeaf95d30492d62dacef6bf3c1b346d99a650da SHA512 618b2fd97ec3d8281b5567242cf6935b00c3f3851c928c52455d71c0a78cf4c10f32338153a62ba6fac3901e2850ede49ea3d017cbcc21068bbabe4e526efd32 WHIRLPOOL 3f84b58e1078975daf110201a8e8598d6250dbdcb4263353d8a9c47d801dd88b34ed2b812127d74825fbe0166a76e147d8ad1427e0d467cb51ba73a2a6cf16ef
 DIST kross-interpreters-4.11.3.tar.xz 134148 SHA256 2ae6db2e10612716b437e1e54bb5c4a32b40671f18b6ada7ffaa3c0ecc6c52fc SHA512 03fdb5b04ee5c1b0130a5b750dcfb9b8a536d747060e6c849b3432897dacb26b1f68707f880903c26e0deac78b03b71fc154f2b07c647cad0b3306db09f2e0fd WHIRLPOOL e7d6c9c2619721bfef173e56dfcb672d888d3a35e36ac141c62db01b2445497369a338be32ae7974853ddc43b5ead02182915e9cf9e57cd5455bb7a6ffb3fb5a
 EBUILD krossjava-4.10.5.ebuild 1185 SHA256 c7fd7b88d1b50c50a1078100994341a60c3a68728ec7db7035347aa2c3437ff3 SHA512 de79e3a47e21b27ba331df3b0e6b92f053d6a78f1104c5a9c5a7b5f5ae03198fa0e4485cceecb39b96befe7d7a039728964da09fe1bde03d8fe491e6bc6c1ead WHIRLPOOL 94512c2b0b2e5a7706ce5df1c7cf42bdd176e74f6bee518523525ae8a9c816ad67d660da7ffe12c4cf0d273cbf5cb6eae485134144b00e54ef0b579c2423fef8
-EBUILD krossjava-4.11.2.ebuild 1195 SHA256 c5b7c5becedc156e77f0b6efa0408fb532979f6111dee8af02afa3676894ace4 SHA512 4b947f79b1d43a4d6f43f6a4467c13dc0bca65335db08e1df61220b78d30c935545494e330c323c9a72a164f4cc460676e85ed9ccad86a3215a616fc92515f00 WHIRLPOOL 4b118579d40db78c39a9b680833205f971c64061895693031f211a65d2dfae98dc341bb6f9889b13b1ffe712f7c1b7ba23185f0c1d8b6d9eb50fb3448206fc22
-EBUILD krossjava-4.11.3.ebuild 1195 SHA256 7981089e8035233cfc8ce469967613a907783f430d41c0cd7f73571febd7b0ad SHA512 003dc9652dc9f9f2fe6db1ff96e2a2312700d26aab61f65b219d77edecfcc7f35dfe4cadd2608a4240be2facf6fba0beaae563ead627cdef7d4266cd13a1fa4c WHIRLPOOL 8f7f6c8ed1daf90bb0a3cf6e1098def86c3df592f9aac96ab8bb9218ec696c626301ba60f07a67e4b350636ae4df63432ebaed6c6a9e0b73388ad2e880c34907
-MISC ChangeLog 18413 SHA256 aad612d18439fb64e8328273f4ffe6bd7e434d93e7560792a86ffdda734f3f3e SHA512 77d4dd52b5c3e4156a71f4ac712b9951864155a898adc24f8ad5a29680fe7ec4ae5f9eef6ac3e99b300f9a98019bea608623fddf50c1b39c80ece83425ff9f6e WHIRLPOOL 89dc47f349e9ba79becbba5ef2060c9208d3f3cb74754b17dbd4946030d21f86afa68258aa51f0f3b68396964ad551ef5c65b89e20dd14ab51fbc7c280887367
+EBUILD krossjava-4.11.2.ebuild 1204 SHA256 d48b71f5ab78996ce67fc508523beab488db2eb3e668375d98535aabe13fbb33 SHA512 e4fd0eca87b4e883f959dc2ef6e0c8ec41864b1ba33e45faac608a1920fe87af7ec17dcd06292f6455721cd913e5eea99fe324eb73bae232d89f171f3512eca3 WHIRLPOOL bfdbb3fa77fa5c4fcc1d8755c1e31621e5557037c565a6804dee415d582c15f15b2ceed0833378dec9c7b3a4f665ad14324bc11458689f356a0a93dc77575591
+EBUILD krossjava-4.11.3.ebuild 1204 SHA256 862ff14afcc6c4cafc26f71f7968fda036c5019680db66807207e2e8ee3d8b06 SHA512 11edf37a291399959a35ff620cb43b8bdf74843f420d1d28489f857433c2c37cf06cf65201124c7697b64f9397443b8e204ec9b2af4f864856ceb98f8b848989 WHIRLPOOL db390c56d40c6c3ee05d512e7f42fa511619d8985b3941c530e72c0f5a45d78d0c4a371ddfdf56fb95e79ddc6f86de9a108c6f2b9df9b5f0e2aed6e58008369f
+MISC ChangeLog 18558 SHA256 859c2bc8c55f230e7c5d3220aec1925c4b6b8314bec70843e7aef1463deb062b SHA512 0478bf55801b8308ba09889e4d31fbe390840bd2c06cfefa99144ce964ee15b299d298d88bc0676935d09fc10de5984e7c17fbd903c3acd4237a687030b231ba WHIRLPOOL b082cf9416c517144a8bd3ea610e062d55c79b38183984f4621c3b2ea5cccbb1a06714d3cc6dcadf688d9347ad91ac8ae61453714f6aac791b8890b80e59e89b
 MISC metadata.xml 177 SHA256 1574178b37d7bbe808bf11c87fdfa27ace4af75a8f1ed0982529241ce3eb4664 SHA512 0efab76848ee4b0ce301fdd0714d4817a36485b16a58bf500a979747327082671fd956a5d4160d8170671e319ea5be3d5a91d0831a7ceaae28c906411d6d85ef WHIRLPOOL 66dda5e32a05be881b1a39248fefe437b91e5076d18994559469b4f9df12990dece920287605ebf8ed2cbf603085dbec00b0e8e0884562bdab96312f728c97e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSeXBWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcJy4P/16SKjHF+c2ntjlH8xh99l9O
-XndA8szLcpXrUd8DpHUb4zR+QSWMxOKSrV3BuqQAskMc/A0FRw0ewYimxUcvJY2D
-vQc7i6tplTsZ/ybC7jUUZKcvoa5zoQ5Orh85RU0v0jla+1u318pDPJe1AZ52qiDU
-Mq6NJh169FDpqBYelNYliLqdlmA+adC7udQjr2tUfmWa8Z22UboHz6Xs7mbgaiqm
-EYEAau5w30MCa/ZaSG22m3XVXGAQhKc/TfYYE3hSvDYqCL5nKb5qCG+iiImqP8pi
-liYJinMRw5nSppsDJOCUNCmaamJAeiWjEbnHZelZcqhdBMjSj5nEUwK+f7e6N2Qz
-NXPqZeN/+aMQWd6k4TeFR5CNTUv2W0bRSymkF0X5+QKr7S8gJ4ueUFIzs6Sn/Glw
-IuQQlfIqRHF21RjM4E0vzeHdhCSZiqYJMBJwUwApnMkgDgSKrkFGLS55eCOF73dS
-9jRE8b3LQP70N03HaRxiY2fuKoDO+S6JZ3yMCUEHYd597WII1s2uYFQundAMwkPE
-jMNp8NL8OMqbtIEr8Tlyhp1jLOJjuTmfFeR9fX8olKnMVNsbTuLgOzkDDMuj9Njq
-fluzAz2sdbsCYeYNfnvCKryfJwb4N8sOykeS1A8OQVTJQdlziq50fS1o6XGXg6Rf
-o/AOrW71+COw89jHhTX+
-=CcZI
+iQIcBAEBCAAGBQJSkN31AAoJEGVpnaTzz9K9/GoQALHaPmFAvq9kyO+27Q7GI1iV
+XjvoHr3fjDZz2+rTQk5exx2vn0z9/v9MIiVEIPhldzBsbey10LI37qSX8Lqhnhzp
+DE/LqV+uhXta0RcqqLvy6g8sSnnDGIHUcb7jLqyj4iWxnWu6svLlNjE+kcMjt0bI
+GnXMUiTO/5bv33cTv+rnIZVbbOwfZ1lsMHx1a1SUd7c/gVCEaMoQ2UDuDGQ5OkH+
+VD7ay9MtPGTtkG8OBTILBnne9AlgriR4izMwR3NyG+ed0EdmFqCnrlSLc5Ku//Sp
+RE9GuDYU9vdEEBxKjz+yqy4+1to3NYSFFpWxrugSFozYjSI38twpwAkOK9GK1Yqm
+DH1l6ZK4uOAAe3P9fwcO7TDFGVu1UsRKU1AGKgo64odUgXvCcX162WuMChz7ahsi
+GZoTSBtNeGJI22yGtSBcytZ+KqIU8uaO7+HJ8gp1OUzYvMWrfhHSyMkBdnBs0hGe
+46lDRSvE9xfgdA1TRi1Z2RlpogtcN0rVs9QLkEdZx/6egD45AzLffmnKboAozOLk
+MauVMmrdU7WfAj6mQzN+DR2knO6pneXvLhS2XcRQ9092nL+ZAXLPLakU/WwdTm4d
+se/suG/xpInpvqfj6rht9X+UUUzYNxKfirEOEhMNRKwTqeFVqM+1Vi7dGUdAJYiG
+XWVm7TyOrQBr1Z390ymg
+=gEfJ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/krossjava/krossjava-4.11.2.ebuild b/kde-base/krossjava/krossjava-4.11.2.ebuild
index ec979df4279f..38cc52989d5b 100644
--- a/kde-base/krossjava/krossjava-4.11.2.ebuild
+++ b/kde-base/krossjava/krossjava-4.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.2.ebuild,v 1.1 2013/10/09 23:04:42 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.2.ebuild,v 1.2 2013/11/23 17:55:20 johu Exp $
 
 EAPI=5
 
@@ -9,14 +9,14 @@ KMMODULE="java"
 inherit java-pkg-2 java-ant-2 kde4-meta multilib
 
 DESCRIPTION="Java plugin for the kdelibs/kross scripting framework."
-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
 	>=virtual/jdk-1.5
 "
-RDEPEND="
-	>=virtual/jre-1.5
+RDEPEND="${DEPEND}
+	!!dev-java/ibm-jdk-bin
 "
 
 pkg_setup() {
diff --git a/kde-base/krossjava/krossjava-4.11.3.ebuild b/kde-base/krossjava/krossjava-4.11.3.ebuild
index f4347740b03f..4738af26566e 100644
--- a/kde-base/krossjava/krossjava-4.11.3.ebuild
+++ b/kde-base/krossjava/krossjava-4.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.3.ebuild,v 1.1 2013/11/05 22:22:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.11.3.ebuild,v 1.2 2013/11/23 17:55:20 johu Exp $
 
 EAPI=5
 
@@ -15,8 +15,8 @@ IUSE="debug"
 DEPEND="
 	>=virtual/jdk-1.5
 "
-RDEPEND="
-	>=virtual/jre-1.5
+RDEPEND="${DEPEND}
+	!!dev-java/ibm-jdk-bin
 "
 
 pkg_setup() {