Use pax-mark in src_compile() instead of src_install() for src_test() wrt #423927 by "kensington" and "Nikoli". Punt bogus RESTRICT for multilib-strict and emphatize it's an Portage issue instead of polkit issue in src_install() message.

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

3 files changed, 45 insertions, 14 deletions

diff --git a/sys-auth/polkit/ChangeLog b/sys-auth/polkit/ChangeLog
index 8132e6863192..1a6bbc84c84f 100644
--- a/sys-auth/polkit/ChangeLog
+++ b/sys-auth/polkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/polkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.104 2012/10/07 10:46:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/ChangeLog,v 1.105 2012/10/08 06:24:32 ssuominen Exp $
+
+  08 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> polkit-0.107-r1.ebuild:
+  Use pax-mark in src_compile() instead of src_install() for src_test() wrt
+  #423927 by "kensington" and "Nikoli". Punt bogus RESTRICT for multilib-strict
+  and emphatize it's an Portage issue instead of polkit issue in src_install()
+  message.
 
   07 Oct 2012; Agostino Sarubbo <ago@gentoo.org> polkit-0.107-r1.ebuild:
   Stable for amd64, wrt bug #436666
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index df013d7b7096..abb46fc1d329 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX polkit-0.107-fallback.patch 1849 SHA256 ec59771ea95ac45656bc80bd94ab695990068eded68a340b386f6296f40d2c28 SHA512 bfdb551fd670911d40da6dee227c276e1f4da85cf5ca2f9e230d84b876c6185840ce1a4e8e1165d4da67839b27c97d7af27c18dcd08a29f75937b3556e730d9b WHIRLPOOL b5f08a4512eb0ecc2f420255b666b65c2ca64e14103b8afccfc1735cbdf8bea5d2b7a7a22c8933cf978027bc9f115bb7cc700645001c08c14bef5ad9a842279d
 DIST polkit-0.104.tar.gz 1416583 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9 SHA512 c6e74b4601eed0208d400dcf1ddbfc65a61583f32bef22d71afc5a415eb59d6a97f4ba62e8d0c9f38a082dea2b8c5401ac0889a00adcf9e0545e4847cf437cce WHIRLPOOL 94fe0f7545762465794c5efeed80cdf6be44918bc454b3e2189f9dd4cdcfdaba0c25e9ec7e6daf6419d72071bbbe24d468b1d1ece2f0998b9a63476c73fcd45a
 DIST polkit-0.107.tar.gz 1383089 SHA256 c826973db2b226dc8f807af5143f7b8be5d0270f46c0c1241a83b067db9d8311 SHA512 87cf7dddf76a092d7f63e72e6a5eb57b9c137699be46d849b5ea64add30a400cc7be87d0962933e48784576cee350a736b560b2856e7758d7767b06984909559 WHIRLPOOL 985287ff599ff03787f5c53ddf629dc7aafc5f4fbc238d3e47e07b0a5b4c0766045dbdd30d9fb433608be113b7ca2240d9908e02847e293cdbba2191efe7ae37
 EBUILD polkit-0.104-r1.ebuild 3599 SHA256 a4c259b6a560da465278a4a1aba930e8abf1eade4a82adc239e078d8975f6709 SHA512 ef6ca06a26cd0809e7207b8daeb24ea1a6da160ebe23711374cf6b7fe86ae5a3da07b2333a075b4c8e86bcebcc64168beb1b0d4677f24a98e4a90940b647b4ad WHIRLPOOL bc9e1653dc7c58ede295463dd5034ab3ae6e61277af0f83c3ce3431910afbdf4a014309957a3e413948b2c5400a77ff73596cf97a60a878e5ea6bf17eb672e8e
-EBUILD polkit-0.107-r1.ebuild 2940 SHA256 e1e1ca8dcce950b36455aa220fa430f1f4c79b2fdd7e1b5b09f67716fae37b63 SHA512 82539b8d53a00786ba162e26552fbcff198f6ebcd2c28f4769b67c61f501c79533717f074dfdbd284767e6252a21bc9a584e20bbe060cfef8a453c63fbb276bd WHIRLPOOL 0c8fe55464f6e4b17d3ea15abe0c77d2e9dfa4839247dbe26fa27008f2119c54bd89a493560b02dd20a1e2f137f0a39924564eb9a905a25af720730f83003620
+EBUILD polkit-0.107-r1.ebuild 3197 SHA256 ee7b49ff26cd36a58197063c81358c1257eaa705f5697fa837624f752bdeaeaa SHA512 eaa80dc378002c6bd4006f57229156ac01d4209e929e2a61631691c2fd94400e5270883bde2a0b885e599c097b8f5738e96f474374ac86ad949621b15a76c88d WHIRLPOOL eee2de05f425a2c28be2fb4e83096ec4cb69a3acd6b841faddb7208fd45a62c5dc2ff20b1bc80c0685f3b398f849a17e9eeed82c21a84c39e4aadefb19c62a84
 EBUILD polkit-0.107.ebuild 2902 SHA256 aa052c2f83c1c98ed4aa6fe036c788cf9740184aae425c6a054e9daf75fd7826 SHA512 ae74ba2a3885b0277b705ee599acc8ebc2db622cd9e91a3549de64cc7a3bb15d51f65e722654df1116af3e7e9c977f8c3054268681b057f4a618dca229d7635c WHIRLPOOL 08e6a744c7769298431c7284a16b77581d8caeb46dd7ba5481291d53b341e43b1193c9ca2578e6d6240533c5ef4394b240b7da83321a2b5b6b0e1af52c7b6694
-MISC ChangeLog 14583 SHA256 2d6578d8bbe4729d8c4f4cf0749ea0b82301f87a61f24c6196c7f9d254c93e35 SHA512 e7ea33b3f8518379983f318640e07ab145b1b70ab2b9e8c8f7ef81a8bb42f176d7d375bc108676a17f8a04dabc723dd7d152d345ae3dc0cee89f8f37f89cd0f5 WHIRLPOOL 21e769a2496abe81947458a9381074f7505023bd0740e1b03f6455d241551de2afb65e9b603a8db66eeee459ef6cbb53be84cf9186449c5bd9055bfcd325356f
+MISC ChangeLog 14914 SHA256 ac97f4ee033b2e59f707b9a8f27753d9b15e66686f5934ae354905f65c9d3934 SHA512 425783e796f15fd1a45b919f48b7f9b5885011b6a5ed3636bccfbd6d3e392b0586a86a2ee994589fdec07b230e28b1494b2b4ff28c5cb903a956cb7eb72c50fb WHIRLPOOL dec3d2108494e3f6db08d5e58ba279007d5100c38ca1a232a85ae792784ae770450b4f0fdef3e90f3ee83e0c66b364f5edf1f55fb4d97c4690e004d5349a16a3
 MISC metadata.xml 516 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba SHA512 293585c3b4c95b76af687f398645982d84d583e3cbf039a181c67c9710a899dad34cba9ff43f7be03a00d7552f42f0ac0a2a997c3ce7c9b80097a43f501001d4 WHIRLPOOL 4caf1316226570bec927b20957e420217a490c91013154b84f56fddf50cd5b525ccd0fd736a305ef5bc772cca734aadd8fec757238021b3e05046b503468e1a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQcnD6AAoJEEdUh39IaPFNurUH/1RpayiSw+vvQpYUijhZ3mGB
+fdFphdbXApeLPs/O1vMg7f/zyqOeMjRAuxhWsjXJ9XJwc8TPImcLdDFuwZiJp5wq
+EYauYQTLR//hXYyEjSpDVUVDJJZgFpWGoY5o9R7Vgk0IlxcbMMbXkqnEgyS+E9k9
+/sqyG/y6UfbIs0D0ODs5A1yE8rOgsbjpeTEC90flJteZrl9/jbep5l7KE+VvssAw
+PmlvHpJCUZzqcUDY/y41j32eaeoa02g0IpEvvAQcv+c14Tye0HHismDgqz7jjjtR
+L0yXDjM4suG3ZRlQBG87galrXYHVS2Yxt72SMqqjOeFlzvAlpFhDcOKXL6jjwCY=
+=0QPZ
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit/polkit-0.107-r1.ebuild b/sys-auth/polkit/polkit-0.107-r1.ebuild
index 2fd655365ef7..47ec6246d5c3 100644
--- a/sys-auth/polkit/polkit-0.107-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.107-r1.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/sys-auth/polkit/polkit-0.107-r1.ebuild,v 1.2 2012/10/07 10:46:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.107-r1.ebuild,v 1.3 2012/10/08 06:24:32 ssuominen Exp $
 
 EAPI=4
 inherit eutils multilib pam pax-utils systemd user
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="examples gtk +introspection kde nls pam selinux systemd"
 
-RESTRICT="multilib-strict" #424423
-
-RDEPEND=">=dev-lang/spidermonkey-1.8.5
+RDEPEND=">=dev-lang/spidermonkey-1.8.5-r1
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2
 	introspection? ( >=dev-libs/gobject-introspection-1 )
@@ -76,7 +74,27 @@ src_configure() {
 		--with-os-type=gentoo
 }
 
+src_compile() {
+	default
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
+	if has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m ${f}
+	else
+		pax-mark mr ${f}
+	fi
+}
+
 src_install() {
+	if has multilib-strict ${FEATURES}; then
+		ewarn
+		ewarn "Possible broken flag multilib-strict in FEATURES detected."
+		ewarn "Your build will likely fail to install wrt bug #424423."
+		ewarn "This is a bug in the Package Manager instead of polkit."
+		ewarn
+	fi
+
 	emake DESTDIR="${D}" install
 
 	dodoc docs/TODO HACKING NEWS README
@@ -92,13 +110,6 @@ src_install() {
 	fi
 
 	prune_libtool_files
-
-	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}"/usr/lib/polkit-1/polkitd
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}"/usr/lib/polkit-1/polkitd
-	fi
 }
 
 pkg_postinst() {