Add missing pax markings for x86. Bug 389751

Package-Manager: portage-2.1.10.35/cvs/Linux x86_64

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 1c25119c1af544ed11cfa7c1539c145e240f622c..0e67bc97fd8bdd56f8eeac6584840ad2fc17f38e 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.310 2011/11/05 10:08:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.311 2011/11/18 22:11:13 sera Exp $
+
+  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> sun-jdk-1.6.0.29.ebuild:
+  Add missing pax markings for x86. Bug 389751
 
   05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> sun-jdk-1.6.0.29.ebuild:
   Stable on amd64 wrt bug #387851

diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index f7f5de9b64fd420a89403d779dae138d890e8a00..af1d86add443aaffd5e1f5d234d3342d5b8cd4be 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX fontconfig.Gentoo.properties-r1 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8
@@ -13,23 +10,6 @@ DIST jdk-6u29-linux-i586.bin 85146345 RMD160 fca7a51bf14486a81a684c91152493e8af6
 DIST jdk-6u29-linux-x64.bin 85411605 RMD160 7bb1433728c9d263bfe9d968595aac7d73e6c2f3 SHA1 45286e11864285c0d9d5cafd0355dbe04d272951 SHA256 a8603fa62045ce2164b26f7c04859cd548ffe0e33bfc979d9fa73df42e3b3365
 EBUILD sun-jdk-1.6.0.26.ebuild 5148 RMD160 bf671e5810cb4225217bbd6e5afb68e5d146f9f5 SHA1 07c7bda810d9a68c01e76712fd7d41179caae6cc SHA256 16b560b7693ffa7d61c30aae5c9e8394e07bf2b69dcb0cb55ef536d708d87366
 EBUILD sun-jdk-1.6.0.27.ebuild 5658 RMD160 a5600317f7109655bd4a27da34031db2265fe73e SHA1 ab33d4ad61cc35ea7da4d2cccb03debd812dd9d4 SHA256 7ac9e07da2f41bced38f7752fb48bc9e82de9bc371855778b3cce18fb692f0db
-EBUILD sun-jdk-1.6.0.29.ebuild 4601 RMD160 255e6133902b493a8e7db6bc9f4823d2247cc986 SHA1 7945deb8dc323776c5ad6e6a26673babfa41767d SHA256 509863a5ca333e5b0c2d43a623934b88e15a439e238a927569359779463a36ac
-MISC ChangeLog 57241 RMD160 9d9178967edefc743af0079300b326dbb9d3eb33 SHA1 b941a7cf2470d1cd666cc70214b455cdfa3e1b01 SHA256 6bb32df7c6cc2c0ad6d001695e350f03468e40e11774295fb9f1474668da7263
+EBUILD sun-jdk-1.6.0.29.ebuild 4645 RMD160 1d22065eeef6f8b1a9824c056badd9621acec098 SHA1 1099e676a61847bc4a9d8458ab7378f6cdc1ee11 SHA256 2992ec2784417e44ed67100b56de9bdd73e759b1cab63dfe24cf265fb9077e5f
+MISC ChangeLog 57360 RMD160 d5c6b9fe55cdac090b947e9e8e04b74ad9578bf3 SHA1 1ab148749d1e1bc843f64df4e89f21fc1f6716af SHA256 8ef795517b0bd4682870f2d0204d5ac1f1e21ae323a10d7b57c3e059618637f3
 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOtQsfAAoJEPqDWhW0r/LC1SwQAMPT5SlQ3YRI/MYJ9ON6o8B4
-eMt91znSBL8wTRbZoEBnZH3JFmFpoGY4BgDJkgZQQF296B6CgzDV/roClFaeu4AY
-dUgY4peVRMjeKUkgY7w1Pl6eDk5aTvyLmVp+V1emuJXjbdY3fv86xiOuXAUvPKpv
-VbVPZIdZ8+d1fFhZDvNQO0LMiau6CvUqvimui+lQUj8ckjoPwmDcxkQcbWQXPuyp
-zlKzbKdN8wwkEgr5ViWgSaLYDj5CFPUjK8U/YjXdPuoV9Fi146MiJO00FVpFK9x8
-I6MbVvOMQV8ZsD9fTJcenEQvdAJOlNFBsmtwdSWPUyvN1chYL0CsHbAe0zo3tdwb
-8PmBmzO91lgEiDNxzIxDtXIp5C1s8lB/RUgR/aKpYsRjwusCwxjFh8VdpE7b5QTf
-7m/JnfWZpDdme5A3fZBVbjvgVlkl0MquiG8PMHveWvVBN3lnxzwmKg0uOZSUEtav
-TE3zhT+EYFDLKg9Saz5FlZzH9kO3DINHJP18cbK/HMc2jVIqQq7H69m/4ETCUVpr
-vXHTuOwocMogjtAsaL9aZtbN/k0BXUkCEPkEDUUFNeORPHDou/Re381ilnbUomtx
-lSI0yijwfyTQocL5ipBcHKknOcy3X7AxbhQvlyswouaK2rKoxE9DZV/HhEh1pE51
-f6M+Odf3JScR3KHIjLlq
-=j1hj
------END PGP SIGNATURE-----

diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild
index cecace76a381dd66d0779dcd2218f2a9f55a5cdf..0024c0528f60a42c8c0a9e54464297be4d6e59a4 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.29.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/sun-jdk/sun-jdk-1.6.0.29.ebuild,v 1.5 2011/11/05 10:08:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild,v 1.6 2011/11/18 22:11:13 sera Exp $
 
 EAPI="4"
 
@@ -68,7 +68,9 @@ src_unpack() {
 src_compile() {
        # Set PaX markings on all JDK/JRE executables to allow code-generation on
        # the heap by the JIT compiler. This needs to be done before CDS - #215225
-       pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+       local marks="m"
+       use x86 && marks="msp"
+       pax-mark ${marks} $(list-paxables "${S}"{,/jre}/bin/*)
 
        # see bug #207282
        einfo "Creating the Class Data Sharing archives"