Prevent automagic dependency on qt-mobility (bug 547350).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 7cf1f371f855e9e756f5f00654cacac2b20ca27f..3217389d323e7ce381499be5e29f5e9fe4bd2650 100644 (file)
--- 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.29 2015/04/15 04:41:43 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.30 2015/04/26 23:01:54 pesa Exp $
+
+  26 Apr 2015; Davide Pesavento <pesa@gentoo.org> qtwebkit-4.8.6-r1.ebuild:
+  Prevent automagic dependency on qt-mobility (bug 547350).
 
   15 Apr 2015; Yixun Lan <dlan@gentoo.org> qtwebkit-5.4.1.ebuild:
   keyword arm64, tested on cortex-a53 hardware

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 07b20b13cb33188ad6bac1a501f09bf72de80037..f0dd1582b511c65c19c0cac3ecea05054608880b 100644 (file)
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -9,26 +9,26 @@ DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtwebkit-opensource-src-5.4.1.tar.xz 33457544 SHA256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf SHA512 592a3ebccb4578eb0183d1ecd5aae69c7f03482aa09594fc06f58e2c2b82b5e916e1e951012fc1c8e0cea803c4d3e6db64fad41bbca70eb18b8d9d3ff2eab828 WHIRLPOOL 8a42720dd53ce583d48a3b7db1268c092dce11dfbbcf7524f50350145569c2b24b62b82a4715229294321ae7ce719ec56bb448eb7a7be9b2f7792ad1d8d9d7d0
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
-EBUILD qtwebkit-4.8.6-r1.ebuild 2194 SHA256 f676e957d2c090dadc47b533e9bbf5b9e2ca11440b7c0470ee8a4cd95fd4ab66 SHA512 53c1cc1f9ec8b0940ce2eecfb16fc6427ebd628c6a299876bcdae449905c9e1aca159cbc5b9c16c22c47a62b85287702063d777f9a142b8ba74c5da15e178be1 WHIRLPOOL 5b332aeb5ad90778d6eb618a72f680e524943670a1c3597ccf1e5e395eeb8e564b3b6174e4c19e630c23fb0f65d717cd1e87f441d2351e8e08d3559fcc6fe877
+EBUILD qtwebkit-4.8.6-r1.ebuild 2371 SHA256 519ff4bba01f418f477d97ba2e5dfb750bca60d0f2cf515bae9ac35f1fd423ad SHA512 98f074f4546d7940cbcfaed32f7d3c8f9f39684351a53bbff3fa99740721c1954bbb9ee5e5777a498248c31f5bc83bff9fb71e0d752742e6c67a4caaea557888 WHIRLPOOL 2ac53626a8ca10f42a012a96eb96e93474802bb83ea2689893af8d3b1c4fa0310d2a756787f0ce93a975efedcbafcf649f8151f85cfa7a15d9b3a2198ac6ffdf
 EBUILD qtwebkit-5.4.1.ebuild 2701 SHA256 0a0ba1b975c76fd23d252a2cbe2b998b6b8bfd2c24e48b03e8d3a5c34a41b138 SHA512 8ae492ea95f24a5b31ee28b4846f1855caec0f1d2329f48f207dc1c73b69af7443e34205a93993c7be466b143bcdd6f4c2dd58bd5891c3534fa61e745ade8d7d WHIRLPOOL c45caa32d428a681ef94c39d485b52ac61a9b23f06da882c15f4faf46c6cfe59fa8485ead17d74d261dda8e505d2a5217a6c36d728d046c3fb5a6947fe24a86c
-MISC ChangeLog 29731 SHA256 ab0d06f40e019577ae141df502ca3a13529826c5e3ceb9b2719660d5be09a299 SHA512 e090cbcc8501e348ab1316877110cff3fd0818ed9919d33490c759b503f4538b568658f9d1b6022d2a1263ada874740d02e7b0839b0aa7b400127958e61c3073 WHIRLPOOL 1de3d173ad545f97352ee9d4436d5f69944c91a9365e6af4e467a78089278d1ac298c552557a482c00157f070b97fa868ef59387b8d3ef8aa4d0e075aa2bea27
+MISC ChangeLog 29868 SHA256 23a234818748b7951cc0bfb93474707d4a4c4a144fd1f52db70ee9ef98546ec6 SHA512 4717da5fd4a3ddf34a8d960e20d171a1fc3fb6997cee8fbdcc8723cd6a5e02966d070ea7945a36a761119dcaf9ce7c39f541bac9750bfb56357cf0e6ef21424e WHIRLPOOL 6081135bd30b0b10525e53d43786b5ea53740ace7ee61521d48a1c0daba6df2663e07accfb78ac092385468092ce3621c190536084ecd2214e5070b214a1b5d3
 MISC metadata.xml 932 SHA256 56460390f89a7b9896afa2d2410733c2a618bdd2331fb08eb950e403a36b8959 SHA512 999056b09f39b7bd7fd798d3296d7945af1f4bd8ca397c3a085a7fc2af32daebb7be75df4d322fb406051b2025e97a8b2fcca242ce13aed065d6647bc10c49fe WHIRLPOOL 1741a97d3b1bbff53c7e48df2e634237ef81375362151f20403856992e84727d3be6b62612a159ac0888c2c278bb1d6904b66435ee5a3171058da07d3ccb5cdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVLlqUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvt4hMP/RgWJs8LAMHVAYXp7nThW9YI
-XvkKXe4fhA754cii3C1sw0tQL+obaFQbwU3yewPPI+1TtCbDD7AokAV1cW6OVxZJ
-SOIuq0ZIWGxxUl3udfEfFyrR1iWGy+FyPZ3tzhoSN6q/7aHchwqVts5pS32D3qmz
-aBHnb4GpoMUgBQnpDlvB1uo1mrYjLd8Rh+bpPvEunXnasLto0o2DVe6QF1gKW/6B
-uLd3Pcatz/x5tXGWI//wLLPJc8HA3PyUg2t/DTwBzGJ4aDvNMRLbCbmiwMlJ/YWA
-7dkHzh9gxR+XLv8kBvrZTNwstyG0hr/3D5DYcVYmqip7yoxRj4BDCIHyboSE3qQc
-8XVs1UbPrhQq1NuiFVyps9rRTTARdBZt2+TjYM17XQsxwbbHTfxcvJcjObqaE/wQ
-irz22AE4BKWlT7AWqL3IQOwQRRBtf/if5HFjR46dyf35eWz5VEuUPQ26sAGYpImt
-vriuK9LZE971DyjZ8jNPK2dO5/aF1grHVaxaEgjm/1QUQphUTO9FRfOCIHZPQWM1
-Mj8O+zu7dEa9GSqcdqf8O5OJtorIbb9hJsPXTCwP5VmYJodxCUKmx9X3HSTNlJPL
-RmPnDKE76x+wpCiMcoSt7vUVLNmpRrVCxjxCu5rZw5kSYbZILSWIgLbEQZseYhWi
-KhVCsK197IfSwCCtzI18
-=pIdq
+iQJ8BAEBCABmBQJVPW5qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9mb8QALLWGDKODmk8aXuao1rWDaQ0
+ZYxpWqFVJhCfEOI6EebVm35oR4QaGk79elZ5I307kdIKb766P+UBiTPVgKtnHy1D
+7BH6plie7cIGvNlevIbWz/CNfU6YxNej8zg+QSlc9QUBeTucjhqJR4oJ2Gh4pXg3
++4tIM7+EknjHGlHbTRSM8vUGZ47xXhmHh+jK6bRAQd/dD6HD0HXxm9x81HdRvDvA
+k1SA/nEQKsUwK8ad4NNa+nuGmPK11QrlCwRqR7f+/GcpEdPQIkTy8GnIQsrPjAag
+HO4Jy3zrv2K3by4YUaVUZjEcz7S385P3M8VSuKwO/ThNgKNsLklHXEnHITXk3+Rv
+EcQrXFkDU4RSxfRDCJY8cMn2284MiDig2YBfVyITEGHkKgWSd/adLU4777wOEgcc
+6QTJGmLMwHESgWIw4OnTksa5XcKnYoiDPzKkpjiZUgsSVwf9C+MM5TDO3+wqMcD6
+zx1rv+LY2pFSzMK51uNVP2KRj8uItYU33hvhrK/EbdQcc8k+Vx9pMyv8mSZOlNRa
+rw+VfiFCHGH1lr+HRMwaIQ9vvL/d7osJwrzxB6blwoBbhmts3UR69dBzzOyPg4mt
+os/es48WQXgppGtXpCQWP3YxZHWzQe2UWWVxK+1j1wY07PwRVjTcDX7/CmUlyim2
+uvtBd0zjoCxcffVq/okZ
+=U1TW
 -----END PGP SIGNATURE-----

diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
index 4ed5ee414db3adde49000ae3ab1dc75295cdc236..e9080a6e8d426ba31d8620a3927ed6a9d70c3686 100644 (file)
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:38:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild,v 1.2 2015/04/26 23:01:54 pesa Exp $
 
 EAPI=5
 
@@ -47,14 +47,18 @@ QCONFIG_ADD="webkit"
 QCONFIG_DEFINE="QT_WEBKIT"
 
 src_prepare() {
-       # Fix version number in generated pkgconfig file, bug 406443
-       sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
-               src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
-
        # Remove -Werror from CXXFLAGS
        sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
                src/3rdparty/webkit/Source/WebKit.pri || die
 
+       # Fix version number in generated pkgconfig file (bug 406443)
+       sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+               src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
+       # Prevent automagic dependency on qt-mobility (bug 547350)
+       sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \
+               src/3rdparty/webkit/Source/WebCore/features.pri || die
+
        if use icu; then
                sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
                        src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die