Apply pax marking conditionally based on introspection and jit USE flags (thanks to Maxim Kammerer, bugs #404215 and #407085). Apply pax marking to test suite executables so the test suite can be run on PaX systems.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

4 files changed, 37 insertions, 19 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index da71aa0e9bdb..fb5a3bf74ebb 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.146 2012/03/17 19:22:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.147 2012/03/25 00:14:19 tetromino Exp $
+
+  25 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.6.3-r200.ebuild, webkit-gtk-1.6.3-r300.ebuild:
+  Apply pax marking conditionally based on introspection and jit USE flags
+  (thanks to Maxim Kammerer, bugs #404215 and #407085). Apply pax marking to
+  test suite executables so the test suite can be run on PaX systems.
 
   17 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   webkit-gtk-1.6.1-r201.ebuild, webkit-gtk-1.6.1-r301.ebuild,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 67c748477a32..940f8d6d7ac7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -20,14 +20,14 @@ EBUILD webkit-gtk-1.4.3-r200.ebuild 3489 RMD160 60dcca3f8ea8db6398c2e01e96119a44
 EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671cdfc59be SHA1 0cfa0a81eff8bded59f064fa787fdd716575b63f SHA256 7c94293468e42977281cdf3b7aa78e9c423ec35467256040473eadac17bd2760
 EBUILD webkit-gtk-1.6.1-r201.ebuild 4963 RMD160 37d795b34fd015d00b3eb07b789cb87945f7322a SHA1 988d72b35ebe6b56570b2ffee21bcf5cb839729b SHA256 bf3926008e7e7319b536ed4fd3ee88a0544716272929c8d508be912a55842a01
 EBUILD webkit-gtk-1.6.1-r301.ebuild 4899 RMD160 d46a328d4708f22f9ffad885b28c9f8dc1068a7b SHA1 9c2e82d49da22f695644c32d0e965cb49835649a SHA256 330ed30997119f3b82c959ca3d06bdf553e0a31684a3923df166519d029f1610
-EBUILD webkit-gtk-1.6.3-r200.ebuild 5053 RMD160 b6efb06affc0281ecfebd467b40cdfd2d519b8c1 SHA1 035494927163fd2693bce564c2dacf4236fee3f8 SHA256 afb176321ad5ab32b4bf1770455129cb99e3411be1874e64dd51efe2febbf53d
-EBUILD webkit-gtk-1.6.3-r300.ebuild 4881 RMD160 eba8ae69b5510c5e4962ae3e29af5069ac08b14f SHA1 4b3cd3764935e4c031a470019abe929ed0ec61ab SHA256 8cd04fc9d1227f4822b68b31f3bd77e5d5c10086aff78b5ba40750e3e8e30d68
-MISC ChangeLog 29202 RMD160 b9bd786315ab40f60fab6764ab663eb15c5b75bf SHA1 717fd99d82c2ce1ba18e0c2450b7fee0f38dc1e4 SHA256 37e14b968d836b7ce79c8a04efda20d7b7d164bdbb0d607e9d3f4d9c011069ca
+EBUILD webkit-gtk-1.6.3-r200.ebuild 5305 RMD160 2fc401fc23c9bc7e15538850675adf7c8f0249d2 SHA1 1675235ea4f12be876e325cdc21e25c1848e6dd9 SHA256 b12b080d0a044c9cd98cdb8617e8ff4fba7a12836e92ca16058a24aec3ec6dbd
+EBUILD webkit-gtk-1.6.3-r300.ebuild 5133 RMD160 6cb6b17685ac942cc3003bc3b173755cdb0753cb SHA1 bb62ef1de44178bc7cbbc940c594eabffbc4557e SHA256 2d032d3208fa73a7b7cfdcc562e6a1b4e476b0912a3658e2fef5bc5332214eb8
+MISC ChangeLog 29546 RMD160 1fdf849d8cc3b358983371d29fe5ab3351ca7c68 SHA1 537d0416e98dc7a7b413730897b2ca6cd3c3fe8e SHA256 cbd8d15da2f0a3721d622950e27ab358a5b5a99753277a965118bfd9a5c5e15b
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9k5JgACgkQdjK8w9WeBnDUuAD+JJzXo0lGLLjXZpfZd5GeZwYS
-6MLWnuqPu11uqijYRUUA/1oCjQL1agfnmpm2kTOLwRqp0xvJpllunXaBKWbu19lq
-=90rX
+iF4EAREIAAYFAk9uY2AACgkQdjK8w9WeBnDv+wD/SXJZqgVVbZM1V42E0jmJKxUb
+vHfWw6M759hRawHdocgBAIJ6dYwIqmUZ8WgXQj7qnkpLTX+rbs5ZYiUJCYsRBbbD
+=Yu7E
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
index 7c16d5327cc3..ab54e58b8c9b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.5 2012/03/17 19:22:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.6 2012/03/25 00:14:19 tetromino Exp $
 
 EAPI="4"
 
@@ -55,8 +55,9 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	sys-apps/paxctl
-	test? ( x11-themes/hicolor-icon-theme )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? ( x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -98,8 +99,10 @@ src_prepare() {
 	mkdir -p DerivedSources/ANGLE
 
 	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
 
 	# We need to reset some variables to prevent permissions problems and failures
 	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
@@ -146,6 +149,9 @@ src_configure() {
 }
 
 src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/unittests/test*) \
+		Programs/unittests/.libs/test*
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
 	# Parallel tests sometimes fail
@@ -164,5 +170,5 @@ src_install() {
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 
 	# Prevents crashes on PaX systems
-	pax-mark m "${ED}usr/bin/jsc-1"
+	use jit && pax-mark m "${ED}usr/bin/jsc-1"
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
index 5dcedce5ff2e..66524ba7e1d1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.6 2012/03/17 19:22:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.7 2012/03/25 00:14:19 tetromino Exp $
 
 EAPI="4"
 
@@ -56,8 +56,9 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	sys-apps/paxctl
-	test? ( x11-themes/hicolor-icon-theme )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? ( x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -90,8 +91,10 @@ src_prepare() {
 	mkdir -p DerivedSources/ANGLE
 
 	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-	cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	if use introspection && use jit; then
+		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+	fi
 
 	# We need to reset some variables to prevent permissions problems and failures
 	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
@@ -140,6 +143,9 @@ src_configure() {
 }
 
 src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/unittests/test*) \
+		Programs/unittests/.libs/test*
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
 	# Parallel tests sometimes fail
@@ -164,5 +170,5 @@ src_install() {
 	find "${D}" -name '*.la' -exec rm -f '{}' +
 
 	# Prevents crashes on PaX systems
-	pax-mark m "${ED}usr/bin/jsc-3"
+	use jit && pax-mark m "${ED}usr/bin/jsc-3"
 }