Revbump to add sandbox.d file to suppress sandbox violations of /proc/self/coredump_filter when ibm-jdk-bin is used to build a package. Fixes bug #321695.

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 36 insertions, 562 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 3750417a096d..63c5ddcabf4c 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.231 2010/10/05 20:28:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.232 2010/11/01 21:25:08 caster Exp $
+
+*ibm-jdk-bin-1.6.0.8_p1-r1 (01 Nov 2010)
+
+  01 Nov 2010; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.5.0.11_p1.ebuild, -ibm-jdk-bin-1.6.0.7.ebuild,
+  -ibm-jdk-bin-1.6.0.8.ebuild, +ibm-jdk-bin-1.6.0.8_p1-r1.ebuild:
+  Revbump to add sandbox.d file to suppress sandbox violations of
+  /proc/self/coredump_filter when ibm-jdk-bin is used to build a package.
+  Fixes bug #321695.
 
   05 Oct 2010; Markus Meier <maekke@gentoo.org>
   ibm-jdk-bin-1.5.0.12_p1.ebuild, ibm-jdk-bin-1.6.0.8_p1.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 7da078739362..e09603986fd7 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,56 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ibm-jdk-bin-1.5.env 1149 RMD160 04ac562f22f2e16ae0a21380bcf6781f2e05b6e1 SHA1 93d3694d723cbcb1f776a8d064200f5a91394896 SHA256 1ccf08c7cc6429065978a6a0c038654c4e9768c8c150c56c39eb5408c1abe21d
 AUX ibm-jdk-bin-1.6.env 1626 RMD160 425aa7a4e65154c0f426472d8e2ec62324598124 SHA1 a56f585b3c472f467276422ba8b55c12f9043852 SHA256 5c1804c89e0e1699972a08e3f420988ac4f6aa074d8c63ca585b09646ec5c28d
 AUX ibm-jdk-bin-jawt.h.patch 377 RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd SHA1 5fa611adbdf036678bb0d582d2013225251d5a9e SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff
-DIST ibm-java-javacomm-6.0-7.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
-DIST ibm-java-javacomm-6.0-7.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
-DIST ibm-java-javacomm-6.0-7.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
-DIST ibm-java-javacomm-6.0-7.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
 DIST ibm-java-javacomm-6.0-8.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
 DIST ibm-java-javacomm-6.0-8.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
 DIST ibm-java-javacomm-6.0-8.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
 DIST ibm-java-javacomm-6.0-8.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
-DIST ibm-java-sdk-6.0-7.0-linux-i386.tgz 92369339 RMD160 58bdfcd01063c7f6e24b97657c17659447bb9418 SHA1 943f4c4954cf2f5c85d2910b2063d3e9f66cab7f SHA256 d9b7904ae93e58644ce7026bd1b45851a080667524d8c2f8194e07438a3e80c8
-DIST ibm-java-sdk-6.0-7.0-linux-ppc.tgz 94637963 RMD160 ef3cf9f3ad38ef15c91f5752c40d834b650b9caa SHA1 ddbc2192ddd1425e4d5f8a9dc09c35c21b9d86ef SHA256 d7e63b79b8bdad369e6f1286eb53906c489f9e78ccdf0f8eb845a241dd796dee
-DIST ibm-java-sdk-6.0-7.0-linux-ppc64.tgz 96912498 RMD160 e2b0cccbda04749b5cfe136614e740788720bba1 SHA1 dcb9818b9462edbc6907705e05098d95ff755960 SHA256 be0d5e2e3539f4b63e9658a7e1045872056dfae6185cb11aea8a806d0dc6957f
-DIST ibm-java-sdk-6.0-7.0-linux-x86_64.tgz 93457031 RMD160 faaf9d8f88a55f59c8eac64e8abe02cdfd3f6b36 SHA1 33f4762c79bc43f06b80e4e7b724d0f9304e410b SHA256 5e8bcbd3f458014abda25e93752769804aff65a1646180f306a34ecc666377fd
-DIST ibm-java-sdk-6.0-8.0-linux-i386.tgz 93360878 RMD160 0a0ed4a65ca397419b65f813a402708d1a2438fd SHA1 7aaf12b9c3d3bc6255c0fba11fe0203776f424c1 SHA256 29f018f8619d5b968d6f58031612f079f347dcc919493afdcd4e2d79d828403e
-DIST ibm-java-sdk-6.0-8.0-linux-ppc.tgz 95626915 RMD160 c8face90b33cd34b3b5e508473d3e9bad95723f9 SHA1 ec0656692d8269e66d56a18cf968671689c0fb9b SHA256 662b18b98e83e7d07f7bea97a29f7e3c516b7807aa83530ef3e3c6bff5c13b17
-DIST ibm-java-sdk-6.0-8.0-linux-ppc64.tgz 98051945 RMD160 b9f53e7442cb3298c11787f161ed9d09e7a7f449 SHA1 c92fb1cd8fedb0ba5cebc592d7fb19b8043c30c2 SHA256 f2ea8cd52731a0dec55aea9312fdb147bb71989b3b1e1611d9ce16a36fef6d53
-DIST ibm-java-sdk-6.0-8.0-linux-x86_64.tgz 94483318 RMD160 367108b366a68117dd0ef02281726a179cf759cc SHA1 c7fec7cd23c345231076639fe42068ab5354606a SHA256 05a3a41183aae2d4bb09768ad5aabd0f5ea85cef36d712ba0ea2e349a7bb226b
 DIST ibm-java-sdk-6.0-8.1-linux-i386.tgz 93457440 RMD160 f981a47988b1804e40ce592307db29386b22266d SHA1 c494dc6b59d1663aa9231dd7a5dff0cd3defb071 SHA256 335ed60b8c409008063a5cedcf5cc1c18c15d0301eeb6893adfd0a274bea51fc
 DIST ibm-java-sdk-6.0-8.1-linux-ppc.tgz 95735540 RMD160 0428fefb2200c694cbe5d42935e7580c702c21cb SHA1 a9e59ba0d254a11478fbbf92429b765577d20a4c SHA256 d7c4529c1b3b9d5c37bd8032eb65427b6867164582310aba67acf3a1c6170401
 DIST ibm-java-sdk-6.0-8.1-linux-ppc64.tgz 98122567 RMD160 d83964429bb3fb3ae827922187c32770406a58ef SHA1 4bf3d16f8a989d59c8bf63677d818a3c7db9c286 SHA256 702ef2b8cc88e1afa3e7731b03c6ef99bc3da1c31125cb7a242fdafa7061fa8c
 DIST ibm-java-sdk-6.0-8.1-linux-x86_64.tgz 94584322 RMD160 c86a9eb36ec17bcf13e9f5e9b6a93693dcd3f011 SHA1 fc74adfd97eec8f2e778bf641fccfcf22c2eabd6 SHA256 e436aada7a3431c921ffafc2dcf1aa37a92fbadb8c4ed0ef63aa1705974f8696
-DIST ibm-java2-javacomm-5.0-11.1-linux-i386.tgz 120035 RMD160 622b232efab5e3c75aa1e9be628c7c395a918ee3 SHA1 cd7841f3d83e535920833392ae1b82e87a54a265 SHA256 0d7a27de90263a7ee42acde766acad6c23401251fa0c8fb89d7300924805fdf5
-DIST ibm-java2-javacomm-5.0-11.1-linux-ppc.tgz 124758 RMD160 74c5d687f3633825b537abde525ca0a1ef7d99d7 SHA1 4fa7fbd6d5262bebced2a171cc5c5c70effce4bc SHA256 2f1e7b0967804c78313999bd4c0ad94e9446043d0bc4ea2d77f83719a9839817
-DIST ibm-java2-javacomm-5.0-11.1-linux-ppc64.tgz 128364 RMD160 26045e477912e3b23f8d06a66945c99edf348385 SHA1 0211b50c267ee8563fa25105c3faa0814d58e68c SHA256 1c346a105203aef25f0723c9cba805482cc20b3a5da0d3ae7c767dd0e2724bba
-DIST ibm-java2-javacomm-5.0-11.1-linux-x86_64.tgz 121567 RMD160 a2d79569c13b2bdef843734af16ff9c72cc4cecd SHA1 10f587d4c1e479b7b00b7495c7605f60232df4d7 SHA256 6dc7a8a962a5c6a49ca965461c7e42f882a523e0412726a5a03dc0f2baf78b06
 DIST ibm-java2-javacomm-5.0-12.1-linux-i386.tgz 120070 RMD160 97ce9aa7a9ee8d420e1a09da45e322e703114a2e SHA1 2b8f20ed78cde1fb5aa1284c4878b0a2d66ef462 SHA256 a607d64992aee323ffda3629a1ab48f5c28ca5201f607d0ac55d47ff93c60309
 DIST ibm-java2-javacomm-5.0-12.1-linux-ppc.tgz 125033 RMD160 47217d304b9927516666b275e002269151807ec0 SHA1 bae663a3a5c549133ab7770598095db37a25fee9 SHA256 bdd479f41f197390f1037b9b7a2bc19b48afd73c76971ef7ebd10ed1a53bb585
 DIST ibm-java2-javacomm-5.0-12.1-linux-ppc64.tgz 128557 RMD160 76ff01eb8bf1ce1de7be47dfbc958b0b8e47887f SHA1 d20ec4bd5584eddc45332073f402fb43f099c1c8 SHA256 6803e592617e218ceb3132742c8aa473a9dd573f206ec0cb13bd9c174060da42
 DIST ibm-java2-javacomm-5.0-12.1-linux-x86_64.tgz 121843 RMD160 7250ff84da3fc370f84d8453625fb079a23bf8c1 SHA1 d250dfc4a3d8a8b4dc35c4cbd18f98cc5cbcd5f5 SHA256 cdbe0a041fea962c3b1cc69c51e2c170e20f471feb2894a0ca92afecbf586f44
-DIST ibm-java2-sdk-5.0-11.1-linux-i386.tgz 65732878 RMD160 3a07d394d1198b9cf4be32ebf87ce5bc54160313 SHA1 2d57e36b13ee0fcb76be6bae4b508cf283843196 SHA256 8de8da4cea625aebd4de1f5cfe92d3055073f960416c105819fdc7bda6677719
-DIST ibm-java2-sdk-5.0-11.1-linux-ppc.tgz 73617039 RMD160 af91a007746fe303248953e0e3e4e99c4a7dc309 SHA1 f098debcdfad4a30a2b53aa8ff3e38cdc2a34865 SHA256 37ec7f0911a274e620fcd252505f8a09eb27e526dd5703ccfd9c5b61e404028a
-DIST ibm-java2-sdk-5.0-11.1-linux-ppc64.tgz 72084268 RMD160 c8726f804fc7e96de66b296fab37228ecbe91e10 SHA1 b23bb4bd432a0abd0b316f84557b64caf6905f25 SHA256 3cb6308d099ef5d5e5d0ca6fdf4ee9eda983940b58ab3351c3003064d18cbae3
-DIST ibm-java2-sdk-5.0-11.1-linux-x86_64.tgz 67428752 RMD160 df9bbce7f6a3dc54a4e2acc2f14d94bbf21f6b0a SHA1 679a3407de83de5b99f6560f8e2b88344a4af21c SHA256 b5b9548674f93aa73b3a41d1bd9bda3aa38f68234b8e74878b355c854f424ee4
 DIST ibm-java2-sdk-5.0-12.1-linux-i386.tgz 66401081 RMD160 eacc5b1469cf35cca86f4dd0397e6cef87f8fd30 SHA1 34367971bda63c75f53758d58bc0cbd771d14408 SHA256 50f56e34ad48437150dfce846c50442e3907bcdb684b2975dde92982b30c2062
 DIST ibm-java2-sdk-5.0-12.1-linux-ppc.tgz 74462054 RMD160 bb7d2a5d443d67722225587f985e7c0559755f8e SHA1 fcd4faca4867915147f219ccbd2753091977b2c3 SHA256 386135eca4d4c295c1b7e1c25b4df7b4c86bb0df55ad8b418803a1508a667d13
 DIST ibm-java2-sdk-5.0-12.1-linux-ppc64.tgz 72645498 RMD160 797de85b4a5ef65ff46a6f87f1e7b5f9b09422f0 SHA1 15309dd8528012c62a510e346f413de4772e10d9 SHA256 886455987f9f61ab429fba9b4539f9f8841aaab3d63cce7544b832fba2385f63
 DIST ibm-java2-sdk-5.0-12.1-linux-x86_64.tgz 67955251 RMD160 821a21827acf5ce2e1def9537ef8da68c6b1d090 SHA1 a94ba770d4299077a6d6f3289814c0548221aae4 SHA256 5343aa97cdd6f57e34f7d7b71fcb26ec2219b332ce5c70361156828a940b16b6
-EBUILD ibm-jdk-bin-1.5.0.11_p1.ebuild 7691 RMD160 ea6504693d7fc8f4d18367d9d91692e9baf5fbc7 SHA1 c5abb5b5a92ceaf5278d25ac5dff94c91f3d2085 SHA256 0ead8e886c292a4b7797b03b8ab807feb81c47d75b9c301fdba1b1642abb8460
 EBUILD ibm-jdk-bin-1.5.0.12_p1.ebuild 7702 RMD160 961156986109cf8dc5e844c35b5ad09b40fe90d9 SHA1 f3da831bdf9711f871a3d9836808e5553227459b SHA256 c984060059b1f2690319732d4f16500a2cc57202ad9c7e3304823c86ddce0d23
-EBUILD ibm-jdk-bin-1.6.0.7.ebuild 9233 RMD160 8910b72845f4138229092f92e52ba9f2db939300 SHA1 afeba4b6f227ea3c9ee47f77eeac27098b8d1cf4 SHA256 ae58d9faa7929a3f21357549593b5adbdb61f2368deea76f3ab8c6d08aa1efbc
-EBUILD ibm-jdk-bin-1.6.0.8.ebuild 9237 RMD160 0d2fdaa6782359b2ba2a439fdb09bddf685577ab SHA1 34ec1041970d6877d0727b371d4a1591547dfa5d SHA256 2e5727c102115f814265c292635b11fea5c2ebcabc25df8a4433ffafc652e897
+EBUILD ibm-jdk-bin-1.6.0.8_p1-r1.ebuild 9770 RMD160 5519e520e19483ec1499a5fa17f96254336c4fd2 SHA1 c2018f0726202bdb88fd74d03e021204476c2293 SHA256 f86641e626ee585994fddf8d163baf09dd1d8f61b4e6d23a3573d2ed3a8da49d
 EBUILD ibm-jdk-bin-1.6.0.8_p1.ebuild 9639 RMD160 28885cac0f23a9fe601d741553a88c7937f40171 SHA1 e736698cb3af7597c42bc491310a8b3737209692 SHA256 9d9a931fe4f7dbf04f7be0f2e98e9cf2865e3282aa9d3da6448113576ed4b616
-MISC ChangeLog 35970 RMD160 0442d37f58005b38a9717b311905ef4385eb2255 SHA1 ea893164cd40dbf841dd9cf2b92c7dfb9e23eb4f SHA256 577ea2046e99cdc4b126d3a83bdbfb7d85f3a20133314eeca9520c7212738d01
+MISC ChangeLog 36355 RMD160 34b978986c60c5f012e827cbb4625df20ef8389f SHA1 2e02d817ce56b669a916f46296c74da017b3d166 SHA256 73ef2bd05370044d942973ed4008da5c458b79980731dd8f43d18afdf06e7c39
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyrig8ACgkQkKaRLQcq0GI6MwCgnXPotU1r4UAneoHsosmXSHbQ
-AAMAnRvhNoj6zHrTRswlDOu0wHPixi0W
-=g/P4
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.11_p1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.11_p1.ebuild
deleted file mode 100644
index 4f0920d47291..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.11_p1.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.11_p1.ebuild,v 1.5 2010/03/09 21:40:00 josejx Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-#TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.1"
-
-JDK_DIST_PREFIX="ibm-java2-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${TGZ_PV}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-i386-50"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-x86_64-50"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc-50"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc64-50"
-	LINK_ARCH="ipseries64"
-fi
-
-#DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}fp1&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.5"
-DESCRIPTION="IBM Java SE Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-		)"
-LICENSE="IBM-J1.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="=virtual/libstdc++-3.3
-	X? (
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	nsplugin? (
-		x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
-		ppc? ( =x11-libs/gtk+-1* )
-	)
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libjaas.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libjsig.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/xawt/libmawt.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/motif21/libmawt.so
-	opt/${P}/jre/bin/headless/libmawt.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/lib/i386/libdeploy.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-#	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE}-FP1 for your arch:"
-	einfo "(note that we switched to tgz format because it's now versioned)"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-
-	einfo "You can use direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-#	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "Note: if SR${SERVICE_RELEASE}-FP1 is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.jar} "${D}/opt/${P}/"
-
-	dodir /opt/${P}/share
-	if use examples; then
-		cp -pPR "${S}/demo" "${D}/opt/${P}/share/"
-	fi
-
-	local x86plugin=libjavaplugin_ojigtk2.so
-	local ppcplugin=libjavaplugin_oji.so
-	local jrebindest="${D}/opt/${P}/jre/bin/"
-
-	local plugin
-	if use x86; then
-		plugin=${x86plugin}
-	elif use ppc; then
-		plugin=${ppcplugin}
-	fi
-
-	plugin=/opt/${P}/jre/bin/${plugin}
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			install_mozilla_plugin ${plugin}
-		fi
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc "${S}/COPYRIGHT"
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.7.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.7.ebuild
deleted file mode 100644
index 525361552aa6..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.7.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.7.ebuild,v 1.4 2009/12/31 18:16:22 maekke Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-JAVACOMM_RELEASE=$(get_version_component_range 3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-# looks like they didn't bump javacomm
-JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
-JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
-JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-i386-60"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-x86_64-60"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-ppc-60"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-ppc64-60"
-	LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.6"
-DESCRIPTION="IBM Java SE Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="
-	x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-	)"
-LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="
-	ppc? ( =virtual/libstdc++-3.3 )
-	ppc64? ( =virtual/libstdc++-3.3 )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/motif21/libmawt.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/i386/j9vm/libjvm.so
-opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9hookable24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9dmp24.so
-opt/${P}/jre/lib/i386/libj9prt24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libiverel24.so
-opt/${P}/jre/lib/i386/libj9trc24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9shr24.so
-opt/${P}/jre/lib/i386/libj9gc24.so
-opt/${P}/jre/lib/i386/libj9bcv24.so
-opt/${P}/jre/lib/i386/classic/libjvm.so"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
-opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/default/libj9hookable24.so
-opt/${P}/jre/lib/amd64/default/libj9vm24.so
-opt/${P}/jre/lib/amd64/default/libjclscar_24.so
-opt/${P}/jre/lib/amd64/default/libj9jpi24.so
-opt/${P}/jre/lib/amd64/default/libj9thr24.so
-opt/${P}/jre/lib/amd64/default/libj9dmp24.so
-opt/${P}/jre/lib/amd64/default/libj9prt24.so
-opt/${P}/jre/lib/amd64/default/libj9jit24.so
-opt/${P}/jre/lib/amd64/default/libiverel24.so
-opt/${P}/jre/lib/amd64/default/libj9trc24.so
-opt/${P}/jre/lib/amd64/default/libj9dbg24.so
-opt/${P}/jre/lib/amd64/default/libj9shr24.so
-opt/${P}/jre/lib/amd64/default/libj9gc24.so
-opt/${P}/jre/lib/amd64/default/libj9bcv24.so
-opt/${P}/jre/lib/amd64/default/libj9ute24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "Also download ${JAVACOMM_DIST_ORIG}"
-		ewarn "and save it as ${JAVACOMM_DIST}"
-		ewarn "Renaming is needed because javacomm changes content without changing filename."
-	fi
-
-	einfo "You can also use a direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${JDK_DIST}
-	if use javacomm; then
-		mkdir "${WORKDIR}/javacomm/" || die
-		cd "${WORKDIR}/javacomm/"
-		unpack ${JAVACOMM_DIST}
-	fi
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
-	fi
-	if use javacomm; then
-		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
-		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
-		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
-		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
-		if use examples; then
-			cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
-		fi
-	fi
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
-			install_mozilla_plugin "${plugin}"
-		fi
-	fi
-
-	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
-	if [[ -f "${desktop_in}" ]]; then
-		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${desktop_in}" > \
-			"${desktop_out}" || die
-
-		domenu "${desktop_out}" || die
-	fi
-
-	dohtml -a html,htm,HTML -r docs || die
-	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
-
-	set_java_env
-
-	# a workaround to fix the BOOTCLASSPATH in our env file
-	# this is not optimal, using -Xcompressedrefs would probably make it
-	# expect the compressedrefs version...
-	if use amd64; then
-		sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-	fi
-	if use ppc64; then
-		sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-	fi
-
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.8.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.8_p1-r1.ebuild
index f0186a93e0e0..4ecb2f17d56f 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.8.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.8_p1-r1.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/ibm-jdk-bin/ibm-jdk-bin-1.6.0.8.ebuild,v 1.1 2010/05/14 09:36:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.8_p1-r1.ebuild,v 1.1 2010/11/01 21:25:08 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -8,9 +8,22 @@ JDK_RELEASE=$(get_version_component_range 2-3)
 JAVACOMM_RELEASE=$(get_version_component_range 3)
 SERVICE_RELEASE=$(get_version_component_range 4)
 SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
 #JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-# looks like they didn't bump javacomm
+# looks like they don't bump javacomm in service releases anymore
 JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
 JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
 
@@ -60,7 +73,7 @@ elif use ppc64; then
 	LINK_ARCH="ipseries64"
 fi
 
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
 
 SLOT="1.6"
 DESCRIPTION="IBM Java SE Development Kit"
@@ -81,7 +94,7 @@ SRC_URI="
 		ppc64? ( ${PPC64_JAVACOMM_DIST} )
 	)"
 LICENSE="IBM-J1.6"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="-* amd64 ppc ppc64 x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples javacomm nsplugin odbc"
 
@@ -169,7 +182,7 @@ pkg_nofetch() {
 	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
 	einfo "Please visit: ${DOWNLOADPAGE}"
 
-	einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:"
+	einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
 	einfo "${JDK_DIST}"
 	if use javacomm ; then
 		einfo "Also download ${JAVACOMM_DIST_ORIG}"
@@ -182,7 +195,7 @@ pkg_nofetch() {
 	einfo "Place the file(s) in: ${DISTDIR}"
 	einfo "Then restart emerge: 'emerge --resume'"
 
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
+	einfo "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
 	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
 	einfo "isn't updated, but the files should still available through the"
 	einfo "direct link to arch download page. If it doesn't work, file a bug."
@@ -259,4 +272,8 @@ src_install() {
 	fi
 
 	java-vm_revdep-mask
+
+	# bug #321695
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
 }