Use java-vm-2.eclass to set PaX markings

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

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 61c9c990fc0273a715c77168d72da8065b2cd540..9295c409139b6ee057c6e81accc7f3642a97f20d 100644 (file)
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.202 2011/11/11 21:06:44 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.203 2011/11/21 12:15:02 sera Exp $
+
+  21 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
+  sun-jre-bin-1.6.0.29-r1.ebuild:
+  Use java-vm-2.eclass to set PaX markings
 
 *sun-jre-bin-1.6.0.29-r1 (11 Nov 2011)
 

diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 5ff79ddc54ee12fc9d7bffb7c08d6b9af79a71cf..0e93caef058738f350c8caf9c984ed143444275b 100644 (file)
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -5,7 +5,7 @@ AUX sun-jre-bin-1.6.env 891 RMD160 59bc83699f17395aebc79bf5564ac2f3767aa614 SHA1
 AUX sun-jre-bin-1.6.env-r1 966 RMD160 7cb6cb5c5c482aebe3da916b7b5607f15eb95962 SHA1 cfc8dc648ba2795c748ce3b342ed28deac2fe7f8 SHA256 2825f19a60ecf19c4164a27aa24312c521145236c013759c62242a7772e44efe
 DIST jre-6u29-linux-i586.bin 21632980 RMD160 ce7ba2ec99643b6d47f6b634d7e9fa5877513b4a SHA1 6de26b992a9920117d2f156ff5bbddf2d5b28f77 SHA256 13bd1ce27709be7d05c07221185d4f572242b14a80cea67b557e761f5ba7e440
 DIST jre-6u29-linux-x64.bin 21230518 RMD160 53bb593ae6ff9f09bc1f00a94ebd6a3506260f87 SHA1 820399aed6db6c1960ba0942bc64c49a3b809b89 SHA256 624e566642ebe1dc41d07737d15e3a0ada754f36e7d27a789b4a44a2f2148e58
-EBUILD sun-jre-bin-1.6.0.29-r1.ebuild 4286 RMD160 f19049340ca89f27207f7a35c7e9dc46bf953631 SHA1 8eaf5236337af1a813b3576a9764080e8472c931 SHA256 671db0b290701b931eb26339958fe9857f7a1a135fae726fa6509f3af50f8b42
+EBUILD sun-jre-bin-1.6.0.29-r1.ebuild 4162 RMD160 ffb9dd02b744ebf62e060eb50ff8679456298b2d SHA1 b9235ab40ecbb410038ce08e1f6ae33792c0ac4e SHA256 cee1a2bd2d7a239df1a585c5a91e954144c81b06830b03b253431091d902b6b9
 EBUILD sun-jre-bin-1.6.0.29.ebuild 4275 RMD160 605f3e0f4996c3c98ceababbe55c9e0651ce0aab SHA1 76f8220984f0b7706a918e5dd5763512b439ddb2 SHA256 76efb1ae15a38c6b1c227cb365d01364a91a479715c7018c463161d8b1163ce1
-MISC ChangeLog 35631 RMD160 f418854885a574f2b3dc9a727fcd0c6e90342ff3 SHA1 648cad4a82c65c6ddbe0ea0b59356e98311b23f8 SHA256 f2d0da778ef63db931dbc0d896da30e6e4d7a5f98e5ce03a671726c3b74e684a
+MISC ChangeLog 35759 RMD160 d19689ea899f69b4ef04e91895bccc86abadd9fd SHA1 ec7cb8e5480404a2de898cd0504f16fe2f56328e SHA256 18a3f1f2d4ff513ac6b3b5e8483f24aa457eae1281dd854d2951fcb3540d45d9
 MISC metadata.xml 349 RMD160 ae6db154651b0c2b160e1e6956fb722cb52f2e8b SHA1 219312b9ae33153d205b514009927531ee14b93a SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d

diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild
index cb5a09a84f958bf2f38d17301b0de2ece61288ba..1bba06be9e63bd221e03c016017fbe9f1a8a6ea1 100644 (file)
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild,v 1.1 2011/11/11 21:06:44 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.29-r1.ebuild,v 1.2 2011/11/21 12:15:02 sera Exp $
 
 EAPI="4"
 
-inherit java-vm-2 eutils pax-utils prefix versionator
+inherit java-vm-2 eutils prefix versionator
 
 MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
 S_PV="$(replace_version_separator 3 '_')"
@@ -65,9 +65,8 @@ 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}"/bin/*)
+       # This needs to be done before CDS - #215225
+       java-vm_set-pax-markings "${S}"
 
        # see bug #207282
        einfo "Creating the Class Data Sharing archives"