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

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

4 files changed, 16 insertions, 14 deletions

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index fede26e25e08..dcf0e04eec4c 100644
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.6 2011/11/17 22:49:56 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.7 2011/11/21 10:28:26 sera Exp $
+
+  21 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
+  oracle-jdk-bin-1.7.0.1-r1.ebuild, oracle-jdk-bin-1.7.0.1-r2.ebuild:
+  Use java-vm-2.eclass to set PaX markings
 
 *oracle-jdk-bin-1.7.0.1-r2 (17 Nov 2011)
 
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 0802a28acc21..1c34c460fca9 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -3,7 +3,7 @@ AUX oracle-jdk-bin-1.7.env 1000 RMD160 9067112ce8a31b450755ce6bbcdd1b24d5307e12
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
 DIST jdk-7u1-linux-i586.tar.gz 96648208 RMD160 7a48b5ed92c34f3253e8a87e5ee53580a8e83736 SHA1 e581d977bdb8f2f7608d48b307ab3174a55f8f48 SHA256 acbfb8912a287facbee02ff138d94457aabab409b2f1d15855714ec9608a6cd4
 DIST jdk-7u1-linux-x64.tar.gz 94972183 RMD160 fc2efecd251ec552530ad57888cbdce163e009e6 SHA1 21ef2964df4575f1e5e935205700d06ee70f33b3 SHA256 f88070cfe7fe5ed60dfda7729cf9dd110b77840e2ca8cd14a86d5d2274b09c9c
-EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4838 RMD160 449dfe71f63badf64fc53540f39a871e921d1de2 SHA1 216fd012e9fc3a5f68afb8500a12a2ab6a0c55ad SHA256 7b59fd91d1170fab63ac69faf2fc380e29c1531c4c7a23372567f82c8b5770bc
-EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 4840 RMD160 9bd276a1db625fc02d3892b9bf9d631b8155f953 SHA1 cecd1643cb0e692eb016af38c249a9a6afd02bc8 SHA256 5583c416ab99e4a8120ce1e5186501a2deaf9db8d39047819266caff07e2c325
-MISC ChangeLog 1511 RMD160 f48e7ac1be6240afc35e1c46151aff2f729b7b4d SHA1 f9709c8817cca9cfbd8c4c62e47bd40afb583e14 SHA256 c1dcfb03d588928599c10bdad00fa5b58d850416822203ea560919e310ba69b9
+EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4707 RMD160 c214537b1297d66ac07da8f16df556e8082ffcda SHA1 f3d03ffce05847d8f70f94a33287d2fc8bd30089 SHA256 f62be3481cee5bbc83df49f61c52f46820edd52de410d37ea7386857b699d138
+EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 4707 RMD160 e8dad331b7cbae838d8c0dc312bec13dc7f16722 SHA1 bf9228d934acfa167363ccf2344d44ca46698857 SHA256 72f6750b94200d87ef2677e78786d6d3234956df6527fd165f1c489af0677d57
+MISC ChangeLog 1673 RMD160 df4beb2bfc5e6978757550866d9c784aaedb86ce SHA1 832759edca6f21a54969e9b0a97bffc4c87f2fbf SHA256 7d112d62b5576a4de093b739ff06753cbb1ff3aa3c826629fb42803f46632721
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild
index d6441cc5d77f..e51a20db6806 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-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/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild,v 1.2 2011/11/12 13:18:42 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild,v 1.3 2011/11/21 10:28:26 sera Exp $
 
 EAPI="4"
 
-inherit java-vm-2 eutils pax-utils prefix versionator
+inherit java-vm-2 eutils prefix versionator
 
 UPDATE="$(get_version_component_range 4)"
 UPDATE="${UPDATE#0}"
@@ -76,9 +76,8 @@ src_prepare() {
 }
 
 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/*)
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
 
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
index 58f917d73d04..d0efee510980 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.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/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild,v 1.1 2011/11/17 22:49:56 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r2.ebuild,v 1.2 2011/11/21 10:28:26 sera Exp $
 
 EAPI="4"
 
-inherit java-vm-2 eutils pax-utils prefix versionator
+inherit java-vm-2 eutils prefix versionator
 
 UPDATE="$(get_version_component_range 4)"
 UPDATE="${UPDATE#0}"
@@ -76,9 +76,8 @@ src_prepare() {
 }
 
 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/*)
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${S}"
 
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"