Copied QA fixes from 1.4.2.6-r1 to 1.4.2.6-r4. Added QA variables for x86 in 1.5.0.2. Bug #122831.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 57 insertions, 25 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index d49a2bae51dc..9614ff9d5049 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.83 2006/09/25 18:10:13 sanchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.84 2006/09/25 21:01:54 caster Exp $
+
+  25 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  ibm-jdk-bin-1.4.2.6-r4.ebuild, ibm-jdk-bin-1.5.0.2.ebuild:
+  Copied QA fixes from 1.4.2.6-r1 to 1.4.2.6-r4. Added QA variables for x86 in
+  1.5.0.2. Bug #122831.
 
   25 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org>
   ibm-jdk-bin-1.5.0.2.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index ad08204d1c1d..48cbc3161619 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cpuinfo 12 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d SHA1 2c35d51e0110bd74f2c4cf9f7f063358837ea907 SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11
 MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d files/cpuinfo 12
@@ -66,22 +63,22 @@ EBUILD ibm-jdk-bin-1.4.2.6-r1.ebuild 4845 RMD160 c258b6eaebda22dabe88a5ac449e812
 MD5 886411b0d84fa070af3da8d19c271065 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
 RMD160 c258b6eaebda22dabe88a5ac449e812c6b535870 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
 SHA256 e70b5deff274b12016420fd84f6f57f8096bfd83138625d1d7bcfb767b686844 ibm-jdk-bin-1.4.2.6-r1.ebuild 4845
-EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4686 RMD160 fe711fbfd04d8a2b2facb7503273de29e86fc0e5 SHA1 192d29462be4ad478640741fb4f159e34c2efb08 SHA256 10bc795045b0375386b83c49dc3de3b26568e62178a5740a447235c36b1aae52
-MD5 4aa7c96071f136864d4d6e4f3281fa32 ibm-jdk-bin-1.4.2.6-r4.ebuild 4686
-RMD160 fe711fbfd04d8a2b2facb7503273de29e86fc0e5 ibm-jdk-bin-1.4.2.6-r4.ebuild 4686
-SHA256 10bc795045b0375386b83c49dc3de3b26568e62178a5740a447235c36b1aae52 ibm-jdk-bin-1.4.2.6-r4.ebuild 4686
-EBUILD ibm-jdk-bin-1.5.0.2.ebuild 5249 RMD160 274d0d3fb15e4b43259bc4e93aeccbda50afa064 SHA1 c8422582cf8344eac79fb218bad375b7099f762e SHA256 a8264db7df8598ee45b484d1aa61e07f64ba832ec34cb7329a4fe57548e646da
-MD5 fd490b7e6db1df00a8453f785b612d8f ibm-jdk-bin-1.5.0.2.ebuild 5249
-RMD160 274d0d3fb15e4b43259bc4e93aeccbda50afa064 ibm-jdk-bin-1.5.0.2.ebuild 5249
-SHA256 a8264db7df8598ee45b484d1aa61e07f64ba832ec34cb7329a4fe57548e646da ibm-jdk-bin-1.5.0.2.ebuild 5249
+EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4902 RMD160 25eb9ac67b1ec950a51300eb12248f6d7b604521 SHA1 d7725214a18399cb30e734bc7b9b3677a6f1ef5a SHA256 e3466df38dd1de0123a7daee1cbcca7a88143b05b5b2ea2e21c28d3b7bcba374
+MD5 7b5a9cb098b75a7142260a4f0a1d3121 ibm-jdk-bin-1.4.2.6-r4.ebuild 4902
+RMD160 25eb9ac67b1ec950a51300eb12248f6d7b604521 ibm-jdk-bin-1.4.2.6-r4.ebuild 4902
+SHA256 e3466df38dd1de0123a7daee1cbcca7a88143b05b5b2ea2e21c28d3b7bcba374 ibm-jdk-bin-1.4.2.6-r4.ebuild 4902
+EBUILD ibm-jdk-bin-1.5.0.2.ebuild 6249 RMD160 00da6b0ff9018cd0b693ea968efeb08c4a1a3212 SHA1 2fbec1b32e1e547de1a74785e33d56388474f6e0 SHA256 88c121983f1a6a29e05ccd300a6f474706dfc836db6a065089d3cf76a4699938
+MD5 fff1c985dc753a36c349c4d090cf7079 ibm-jdk-bin-1.5.0.2.ebuild 6249
+RMD160 00da6b0ff9018cd0b693ea968efeb08c4a1a3212 ibm-jdk-bin-1.5.0.2.ebuild 6249
+SHA256 88c121983f1a6a29e05ccd300a6f474706dfc836db6a065089d3cf76a4699938 ibm-jdk-bin-1.5.0.2.ebuild 6249
 EBUILD ibm-jdk-bin-1.5.0.ebuild 2956 RMD160 086616bb4e6575e2c68814bb5153b511b8033498 SHA1 2ed88646d6d794c5c9740dd008925da665c62ba4 SHA256 0310652770e7b791852d4c65ddd68f16602abe0fe50fd5f48cd5e3c534dc24b4
 MD5 b100e3010595d20ad0feb9e46aa49160 ibm-jdk-bin-1.5.0.ebuild 2956
 RMD160 086616bb4e6575e2c68814bb5153b511b8033498 ibm-jdk-bin-1.5.0.ebuild 2956
 SHA256 0310652770e7b791852d4c65ddd68f16602abe0fe50fd5f48cd5e3c534dc24b4 ibm-jdk-bin-1.5.0.ebuild 2956
-MISC ChangeLog 13417 RMD160 21b1480e958e369c7662c45cbf6d9c7ba5d55cbb SHA1 0dc1bae748c3186314f1cc2ad74fcbbddb85be22 SHA256 17b853a0f408b9046dbfa2976164207df79d4eb1229b7e44ab750144422ce2a2
-MD5 b93ad83857d0b4acd1f8581a655fafe1 ChangeLog 13417
-RMD160 21b1480e958e369c7662c45cbf6d9c7ba5d55cbb ChangeLog 13417
-SHA256 17b853a0f408b9046dbfa2976164207df79d4eb1229b7e44ab750144422ce2a2 ChangeLog 13417
+MISC ChangeLog 13632 RMD160 ce8b38bbb73125f19f319c8592f8345942c1acb8 SHA1 b7f7046631af8af6891d7b5c767366e55d657aae SHA256 2e769820ed0c68c44da97066c89e7a430907422f73832e4f12281b9b785bffb2
+MD5 f4fff873f937dc5d6d8f8d3630338ae8 ChangeLog 13632
+RMD160 ce8b38bbb73125f19f319c8592f8345942c1acb8 ChangeLog 13632
+SHA256 2e769820ed0c68c44da97066c89e7a430907422f73832e4f12281b9b785bffb2 ChangeLog 13632
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -101,10 +98,3 @@ SHA256 1e4a90eb01b02f89c96f042546b5461b16c07868222bf643eb99af50a1a8d951 files/di
 MD5 51e8e04e14a44502ca27a46a6fa16355 files/digest-ibm-jdk-bin-1.5.0.2 2396
 RMD160 1b3fe81686391ecf0fdef07586643292b64e071f files/digest-ibm-jdk-bin-1.5.0.2 2396
 SHA256 904666cd8dbe71ebed3d7c19323c840b26ff3d6390fbaa2e918cc2d9376d3485 files/digest-ibm-jdk-bin-1.5.0.2 2396
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFGBq1wmS/YhfgUiURAp49AKCLiNwkhs/3+FuGa9EhllJhJZPgAwCgnTPr
-+oj34+TnHfVL5tEO2o+l8PY=
-=hNg2
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
index 9498503c01ec..d058d7972be7 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4.2.6-r4.ebuild,v 1.2 2006/09/19 16:24:23 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.3 2006/09/25 21:01:54 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator rpm
@@ -70,6 +70,11 @@ RDEPEND="
 
 RESTRICT="fetch"
 
+QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
+	opt/${P}/jre/bin/libjclscar_22.so"
+QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
+QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
+	opt/${P}/jre/bin/libjaas.so"
 QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
 	opt/${P}/jre/bin/javaplugin.so
 	opt/${P}/jre/bin/classic/libjvm.so
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
index 411383936ecd..7fe0219bacbb 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.ebuild,v 1.7 2006/09/25 18:10:13 sanchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild,v 1.8 2006/09/25 21:01:54 caster Exp $
 
 inherit java-vm-2 versionator eutils rpm
 
@@ -108,6 +108,38 @@ QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.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_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}"