From 7d4c6049e34e47fec7ed3d42f41624681e802187 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <pesa@gentoo.org>
Date: Wed, 15 Jul 2015 01:37:04 +0000
Subject: Disable rpath wrt bug 466216.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!
---
 dev-qt/qtwebkit/ChangeLog             |  5 ++++-
 dev-qt/qtwebkit/Manifest              | 32 ++++++++++++++++----------------
 dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild |  8 +++++++-
 3 files changed, 27 insertions(+), 18 deletions(-)

(limited to 'dev-qt')

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index e0fcddf0aad6..fc374388b926 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.38 2015/06/17 15:24:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.39 2015/07/15 01:37:03 pesa Exp $
+
+  15 Jul 2015; Davide Pesavento <pesa@gentoo.org> qtwebkit-5.4.2.ebuild:
+  Disable rpath wrt bug 466216.
 
 *qtwebkit-5.4.2 (17 Jun 2015)
 
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 864e77a0f8bb..e8c27d460663 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -13,25 +13,25 @@ DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f7
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
 EBUILD qtwebkit-4.8.6-r1.ebuild 2381 SHA256 732ab6ee9b3d8cd853f263490979e113b3d2174344c5c6f5d18b37871cbe73eb SHA512 502b63e892f578e0361804ec8d717587afabaceda0499fe1dd7c09a6457ac72e6b1d708dcf719bf3452ae15b33a948590094054a29a47607231fad4433b7773e WHIRLPOOL 723fc3198093afe0c3e96c4d37aab84b5f075b00275a4674082554a8977de96af0b2b2d07a82ad44a4170bd962535c84f6a13d10b6f7d7688d0e80b6b03dfbd1
 EBUILD qtwebkit-4.8.7.ebuild 2352 SHA256 a705d3bf6a7ea7827bcb2f7f36cc54e78a0dd0f2366bf64c0effc07a1eb234d2 SHA512 430d003f3ce6ca9132af7715423591aa92b0cb684d47c7c9ce63c7c817cd16fcdc89029dd0572a1c033a58a576fa13a4d840cd9c4b36c188f7945a5264e1add2 WHIRLPOOL 53adb551d9bdc4d3197fd10e74b23737a6847129cfcc2afd9aa3eb63e567414ae3cfec736d37c997c8941a4ed10e94d2ce4f922ff65bde0e8dd307ec24894fc4
-EBUILD qtwebkit-5.4.2.ebuild 2800 SHA256 a0b1db959a60111c9d90c8d3f7f021180dbebe00d81d5c33a9d2cabcc098014f SHA512 c96b58c9e9c01889350689026af29ad173d2f59bc11d4c6b379f79e157c8d86072a0fb63a6aad0b33ae5ad1205ad15f8227ae18fc795acb97ca6699bad02f0a5 WHIRLPOOL bb7916321604d1428f7f2f1dec8f57cb715193ebe95251f3a03481f6ecad99c71558173b938242da62275f2f77e4f7307d5ce5d3038eff7c89b071a039104b0e
-MISC ChangeLog 30813 SHA256 dfa147da3b4bb4b50017b3e50c98aa40dfa52b4308e16e1e51c5532e04b7223e SHA512 12ff0c38d685b1400e063ae9abe7d94dfde2f934c000dfee6a268dceb98694cff5448e7d4555dff4f9c3eb76016bdca86f5e13d92a97f22f9c0d70cbe55c5491 WHIRLPOOL b81fbda07d1adaf1f86abd1a8f5ae1f41560c686457f8dcd3d4f1c9545b97b0accf1e4522755c21bcc6450e1d29ba5100507156f58ad8c21c531bf35a38750f0
+EBUILD qtwebkit-5.4.2.ebuild 3017 SHA256 f6be9feee16b834f71ada0d673d59f93ac31400068bfdc712e3b1b02fde344ad SHA512 cdd5b86ffd50e4d2a129649d6b0918127310d40f7ead05583677e8421f5ddd6ca6f83171dfb25fe3e6ff7937a7b8cddb835ccb195cfbfc32c335d2c4893f8052 WHIRLPOOL 7d72243b27056782e9fdbe41e57afc29c23e28e6acd54928180671aadb96edbb2d174ca90ed2e8991d04e0f381ce179b03c1fd198a7fb7c786a9993fafa220c0
+MISC ChangeLog 30919 SHA256 2f3dce33eb66950da8c0456dfb042bb2494934bf6ebafd91133eafd51c2b95bb SHA512 bb6fda147f5fa41c4b944bc6005d99d889c3226ca63bb807d18f25837298b36b9f0824633286774921127311fa41229ee96319761bb94a2da6ae486f5ba0c693 WHIRLPOOL cb3c1a28321466708ff201c2fae31dfcee48a211c600dc9a2bcb21781b30c1cc5b8bdd5c47a85a2a562fdbe4b585a07c42ecd9d5a89ea7b89b4bf50bb4897f16
 MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVgZEVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVpblAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9eMAQALPa4oKSIjW9nz400auUMUUU
-HxUaUPvMkVjbG7l0Qv4oDYIP3EYaU94vxmvLDjD3nwC/pjdxXdd1f0GaktoJfJ24
-R6NOST2e4ddss7itAYjyDqe7Va0oh8Gn6SCax1CSz4J7epC89iSSOpk9STx7JvKJ
-s4uvDZf0att4vHjQ3bzVmP7c8weYb48A71XyVXJCY0goYd1usPFfndTTBVJQ+h7o
-T6qNBkwsWh5/+RDFKIn9scEdI0uloVxSFU6P759ShMroUNpO/QaPpP1P+CtklQma
-2qkeBlp3lDe2zqdeNhto+CSKp25o6TNNg+Zi92aXdDBXyJ5b6Xf2edE9uSABJEug
-AtMIhAbehVsbhg0ofsB6TliqSpIclxbgdeiQQqsL2T0A8qii0UOA/uTsS1m2ZlxZ
-+tKC933qIojzX/MPJbYgXtIH/szr8zgRYTCxkq6M9NvfTJoesrGYxX/WDloSSR0p
-lRC+nexlxLzV3xmLeE7nZ+qraAOB5gLI0BOPg1C5RMTOrQDSVGLrPiuggHC8oSK1
-ovObFT6/EM9bYYAZXEBbJb8AlxBQBJqbqb2bNmTCIT6nTzf97DxzwzjxJKN3rrY+
-7U0j1tidbTbZJLjvHf8h5i9VDntCnFWMcrX8lB10zT5658uDAwgrgMxbvh6qaUU1
-wBh9mAtFDvfAonRguWMD
-=mJAb
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Gv0P/1+EbF5urrqr9S3TzVCMzvq8
+IeKpfyDNMP3SUCfcpeEfID+2xx5tTPTsBAf7Me3h9tlhdI6VpSguLHxWNkyNITQe
+ZEi7Qd16qHNFGH8nogP8aClwYpfqz1rM4MlIf94+Yn9cncba1aZ64+YAnlZk90VB
+M5MgLaqU42CwRdo/pWFsTHIkkk9tDHoTESNqaIWpwinjOqMZTQr5mdJGsmD2iVYn
+9L8q9QoVX4LB6k9uCDTXwdNbpU4AnAokh4jmezdAX4XmiMdE4ZoJH9AkyPUq2FCp
+72rmwEw9g0BVTUnnzMBOqiCvA3lEYbYBF1HpsFKEoQQqQnlh3MA7tCDmyol1XBkt
+fUhtCpt7EgkYK+8u/54xYNPwsTFASrE/gRFxqXO56mBqToDhlI6zw8WZFalT8Mp0
+SuHCgDWKFsTYtwcmq711cfWyZLmfA1+hVzPxZw5QJTWolpDep1ugCHcEcYPGEbUt
+bvLKudj0ZsXyJxkgmpQT06n4Aj6Mp+YykGfS4qgAY9jLi8sPsySsRk4UQW78KNqS
+sWifOCAHpZnLiXwfK+AMEMP7JAoBRUpEcB0qikNvzN+FPshECJtJQwcuutLPDfOy
+p8CmnDPM0IH2O+YI9nOd5oEcq/2+0U5+ghZdz8mbMkP/epJichn8SMJFvj+cMq2k
+az/oxN8+NRyhZoyX+zJ6
+=F/2S
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
index 429c9c21562f..e2a25ce7b1c9 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.1 2015/06/17 15:24:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.2 2015/07/15 01:37:03 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -70,6 +70,12 @@ src_prepare() {
 	# ensure bundled library cannot be used
 	rm -r Source/ThirdParty/leveldb || die
 
+	# bug 466216
+	sed -i -e '/CONFIG +=/s/rpath//' \
+		Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \
+		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
+		|| die
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then
-- 
cgit v1.2.3-65-gdbad