Restore pax marking of /usr/bin/midori because net-libs/webkit-gtk[jit] is broken again wrt #480290 by "A. Person"

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 28 insertions, 12 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index c371b9942a48..eeade1282d34 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.114 2013/07/31 04:50:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.115 2013/08/11 08:17:25 ssuominen Exp $
+
+  11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> midori-0.5.4.ebuild:
+  Restore pax marking of /usr/bin/midori because net-libs/webkit-gtk[jit] is
+  broken again wrt #480290 by "A. Person"
 
   31 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
   -files/midori-0.4.6-dl.patch, -midori-0.4.6-r1.ebuild, -midori-0.5.2.ebuild:
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index c395b5450a07..51a74c593fa4 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST midori_0.5.4_all_.tar.bz2 1229169 SHA256 d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022 SHA512 94d71eb5b4addb184b356d2434550c40adc717f105518a78b42df40830467a91a6acc5bd04a02891cd4ad3343e0a881d063bdb7ea979dfa0cbe19a84271e3138 WHIRLPOOL eecda1f91c7b740cbaeae7e44ea90ad41dbb261c543cc1e5a17c2ce50ffba4c7e42218572347b3e1b2101bf4a5fc14511364789819aa54724be6045dfa1db329
-EBUILD midori-0.5.4.ebuild 2554 SHA256 0c7ba73d1ac9e14a40d9df693141426ee8c581eac4899076c8317f6aaee9d03d SHA512 60b361292fadb34a69bf56df9f2b3167eb9be02d7a843d448aff7cf2ae14095449be836082705659594a98f9dfb04e86ce6860162f9220b90b49d131f64fdbc4 WHIRLPOOL 4083e26d02d5c097417ff9c60d0fe7ad921859d597988892fcd36c2b0d027ef888e21f16d88d05a976846cc84103a3ab831f347cbad4d7ca77b850a0534fdd8c
-MISC ChangeLog 16728 SHA256 202696c787c0563e2299a8661a995ade99ab4be9ab182aa0e58282a3207e9dac SHA512 a6a1c7007a62dcc8fa0404533cd9db574786fe12f3791161f79f517559ee4a2dcb8c58fb3d20974ef528483c0a565e0054e3f449740167839e130b631cb60a0c WHIRLPOOL dc6b503102938c91e02538ba7e94dac97c10dad675b2049ad3e19d4d574dc8048a857374a2676e72df76f807b8ae4d274c1cdfd3e8c8eef1a6939c953872036a
+EBUILD midori-0.5.4.ebuild 2871 SHA256 b49f8d7293648802e5f20f7ed50e9c30bd1fc0355423561a9c7e00f9eb946ea4 SHA512 3ee4170a72ac2e5ff4cb480c764f5127172de37def886bc6d80382beabf1e0554a54194ff8c91b968d72cf4ef8a8e2822f859ae300f7692bd45e2e269379ee43 WHIRLPOOL 11f60dfffd5d734ff5cd40b31c1780222218e454e63c4762ad26d75449d32c80629d19182df68e45b77a11ec3edd539d69ccac0bea76307d5474245148112ba2
+MISC ChangeLog 16923 SHA256 e71cd5c0a692f1ed0e08f0fc8babcd35fa3cd8be5f6c1a817096157615060b3e SHA512 6f43a49d6bec515ab0a063e31332bc96d463b7e1fe2a5912ef4e445bd627241a16a1cec80c085c5c5b3d569e9cf3d37886699ae306dee413e13d2b29485de4c5 WHIRLPOOL 743e68f8c7a55d0f94faa4081fa90dbe5f7915a4f23787365e438d0b2ba2f42df6629c5269aed270b260bec97aca628201b3298416a9b7158fac9bccfff5eef8
 MISC metadata.xml 596 SHA256 0fa7bd1140a2b36810b7766e6586d34fed003c56817eb86e9559e03ec03793d7 SHA512 d166a4438ae11dc4efa5fc8834d347e4f29f9ee4fd88c7f09e83ed210b221beb1a9806cd8aac05e1bda22e54ead051e731842b7f2220fae7b7a1cc83e53de263 WHIRLPOOL 3374d47859174c05954af05548a7d2338be0d85b021ccd5345b1ac00ec39aa936360954a09621221534adcbad2662408de5a5b53dadebe352fc9a5891232ab5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+JdCAAoJEEdUh39IaPFN9j8H+gLYUBG9htuLBo3wvcPvPVj4
-j5LvgTtHn1JYb+jTUqJi8jOyApjXQWswTl7TMwJHIRNaw5fu+v0zz1DRRmUgYVpy
-BdM2pBIBUAlTGhG9vlS7laOpmwjnlnq7b/tp3WoEtyh9MKcyzsTNJYMSUMqlMJdE
-BkMhVLD0c+WGxTxhITyZSvxvV16JAI8UuxFJeotWEiTIZDkhGf8AhWen6YM7KrJR
-7UXrm1wfSrRcZEVS5CqpdH1nME4iyW/wLEg0Q7AJCCZlo41Jk1W8d0OxXU35m91r
-UOTj581YNXqCKN5aK/c1ncYbO6cHAbT6DE7mQXK5V8dYQPXUqPQqnheb9/5i7RM=
-=MXrn
+iQEcBAEBCAAGBQJSB0gUAAoJEEdUh39IaPFNDAcIAKC1OjkvsG6pg+bqjNBYf7cZ
+Bc78oFlLaqWD4S6i0FRhUiQ6I9QqaE/pTfbogDSuCxwgq5ote05N5vzM21XVaEaN
+csuptQI80i9V42SLsL9NdZAlfxalHR0kgChRqKu22juLCxtiwXMkZG1IIs1UVrkb
+5lSNl3FL1Lmt9AveAdYYZ/B+AqdvJ6wE5k3ghxb+Ue48Zl6EbcsV4WFQYlI0YxOq
+ORSeViNOZDgbkOodmQ64xp3Lm71GJwoo0MXuWT2Uhw8y8nI0Zwz0HB84ragkPz8g
+kpHmukhcgyNszErxHppzwcTugaummDyRNrA8VRwkl7F4kD1R2wfWjOxRP1mG4AY=
+=v5yN
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.5.4.ebuild b/www-client/midori/midori-0.5.4.ebuild
index 191db49ba359..246ac0da6140 100644
--- a/www-client/midori/midori-0.5.4.ebuild
+++ b/www-client/midori/midori-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.4.ebuild,v 1.1 2013/07/17 06:02:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.4.ebuild,v 1.2 2013/08/11 08:17:25 ssuominen Exp $
 
 EAPI=5
 VALA_MIN_API_VERSION=0.16
@@ -18,7 +18,7 @@ else
 	S=${WORKDIR}/${PN}_${PV}_all_
 fi
 
-inherit eutils fdo-mime gnome2-utils python-any-r1 waf-utils vala ${_live_inherits}
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 waf-utils vala ${_live_inherits}
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.midori-browser.org/"
@@ -95,6 +95,18 @@ src_configure() {
 		${myconf}
 }
 
+src_install() {
+	waf-utils_src_install
+
+	local jit_is_enabled
+	if use deprecated; then
+		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+	else
+		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+	fi
+	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
 pkg_preinst() {
 	gnome2_icon_savelist
 }