Don't check for c++11 support in pkg_pretend when installing binpkg (bug #555374, thanks to Michał Górny). Check for disk space in pkg_setup under the same conditions as in pkg_pretend (this logic was accidentally dropped in the 2.6.x bump).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

9 files changed, 51 insertions, 40 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index cc6c5565c09d..c11688f367ff 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.322 2015/06/26 09:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.323 2015/07/26 04:24:08 tetromino Exp $
+
+  26 Jul 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-2.4.8.ebuild, webkit-gtk-2.4.8-r200.ebuild,
+  webkit-gtk-2.4.9.ebuild, webkit-gtk-2.4.9-r200.ebuild,
+  webkit-gtk-2.6.5.ebuild, webkit-gtk-2.6.6.ebuild, webkit-gtk-2.8.3.ebuild:
+  Don't check for c++11 support in pkg_pretend when installing binpkg (bug
+  #555374, thanks to Michał Górny). Check for disk space in pkg_setup under
+  the same conditions as in pkg_pretend (this logic was accidentally dropped in
+  the 2.6.x bump).
 
   26 Jun 2015; Agostino Sarubbo <ago@gentoo.org> webkit-gtk-2.4.9-r200.ebuild,
   webkit-gtk-2.4.9.ebuild, webkit-gtk-2.6.6.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b0dcf9c12b52..d5a738d71d73 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -24,29 +24,31 @@ DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96
 DIST webkitgtk-2.6.5.tar.xz 10000124 SHA256 b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593 SHA512 b8097e16ccfe10c75e43d81a965a14bde19dcefa6f1ac6ef52c075afeb4c603289c3e7cad05b02af053728df16b5681aafa248e5974319849a0967364bca1f19 WHIRLPOOL 60b0cfccefef0f90ba66f3e89819239574f06e42d2508055843addcf20292747d82d258332bb95ae2730a3c11a2acd74ca595f3f2a3cd54230013e4320a6b6d8
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
 DIST webkitgtk-2.8.3.tar.xz 10437676 SHA256 b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 SHA512 29a8f17d921a3015cea8e1e156c42b8f7d5504643157381888c9613a706070b2bde1435cc83048969cc24b525a3f7cd27a493d9636a4bace6bac921b2179874d WHIRLPOOL 03c6f1206203f79ae69c50dab085872a9920982ac556b7e611e114c4d5753ec31d7c6bf3ccf62ae08929886a02bff001a8ac74ad8a4e0ed96879f74539c0c3c4
-EBUILD webkit-gtk-2.4.8-r200.ebuild 10123 SHA256 e5987b45d3dd92b069e9693690c9a5408875870852307e17b138dd13d8c5888d SHA512 dbce25c2db3c22006f3d8cc964857f46851790bf38c93fa2b86a5ca1814c2f4440099b811bba89145f59b1f9e8efe1b52bc53ba5d279ab21048206c14991791d WHIRLPOOL 90f8d5b7073e530ef5a37e77076a0a88c36553774f8c84a6a75b68dc9e0bc3fe6db7cf606f0e0c6f17ea7f229c232b7caf585a9dc713ccb1bb0bc6744d39117c
-EBUILD webkit-gtk-2.4.8.ebuild 10580 SHA256 f674e94df9333a9decf3f3ecbc5e871d00bb97fd8688ced9061cc9fcf39108fe SHA512 cb02a31079c776ceb9a82ee35f4c69d5313f77ddc7179e281ef1c38b5008c118caf782a491d3ed92f4c037bc9f6a6fd79eaaa49368d7b242a6cb8dff80ae66c6 WHIRLPOOL 297f3dd59a1db2ae3fb01955ec9fcf59f7eb6a59bfefe04f8ab1d5a2ae4d12aa681e196053b96d9cda0e2cc6484e24eb50a143a0ab4a111bb08047f7866b9cc7
-EBUILD webkit-gtk-2.4.9-r200.ebuild 9244 SHA256 5a338d2c3b51256ad2481640620be760d32e5d2fc03af442ea51bc68d87cb680 SHA512 fa4ef9272f9ab5524f71103cb87be01271a6e537028d95f7c46cb190da947ebde5b75b1ea69dedf6dfac9068d58bd64b27bd0151122466fce7551ad1da92967a WHIRLPOOL abf794079ced23a0675cdf317c0f751f06ee245333b745311260b3ae4d44d04e422edb5d11826966f13cb36221c0336db17ea785b34ff2f7db58365cd5e251ff
-EBUILD webkit-gtk-2.4.9.ebuild 9712 SHA256 5090ca7c05c28e8ff1dc0aadb4449450d60e47dc88f16183ac4e458aefae6222 SHA512 44261fcfdfc1ead1cf3926a777aa5e098ddd5a1f87dbe3d05aff9ca519da294c903e20e7fb36db92a5285ab3de998234d047ad07545f3636158acac1f5211100 WHIRLPOOL 5d4b204d754945f13642f2c216dc22f6b628d83b765cc3bfac7d5c1559a509edd2688771efb9e19eb0a1de05081d198d1d43d72ba9978174238884e03d63db26
-EBUILD webkit-gtk-2.6.5.ebuild 6588 SHA256 bba61069c92720242a6861ae93e04d3003f4c0021b7cbeb6639a6b5bbffabc65 SHA512 acd4da445efcd875599b54098f9354065df58ee4f8fe175adcb4d00d0bfb0ab1ae29d885b6c263d145b91e7312742172cfb31df59092ff116a20d90be87f604c WHIRLPOOL 832464171ac03f92a021a8bd9570db43d76cfd9a3e137e4d2f47a570638d4491282d1f744f6733491742494a4ee455c01d7c6455e964791b151af4d0499c80d8
-EBUILD webkit-gtk-2.6.6.ebuild 6911 SHA256 e4ec23e1466304e0952f80459fb06c171a8e9eea52996eef7fa370fb39b19931 SHA512 4bd0eaacb4c78e19495f6afce60a20b3a84e82d1254dac5619821edab7ddbb94875a54a72ae412fd5e8877b3b5596b9b409f38883731a5a47c081ed5d40ea744 WHIRLPOOL 1069bf3bc7bf0903b0b9bf5008960aadbe1412032525b059ac952941a9c7749bdb8bd682b649fcf5aed0e6f069551dd731de6cc8985357e38e99cb0dcf373289
-EBUILD webkit-gtk-2.8.3.ebuild 7148 SHA256 4f1b9a04e8ac3d6cdcb327ea24fd4915e10c9780eafdb5ef291e97e78e3d5925 SHA512 0f1bd3a7e26fc1c196f1df3889c48fa0945be57ce13dc1ee7e7b687de01872d9015a5a4a68429f8d5d58702c8d5957dc7a1738251152d9da01c81a6ba776162a WHIRLPOOL 22d65f705726142b514ac1eb5992e61f607bf04e356477dde7a58fe781d98e63717d634cb6bcf3a3aef6cc86d79d096c6bf8103db31256f575d5cfee368f3da3
-MISC ChangeLog 67404 SHA256 01698e7d57da090a844dfd31f8e204d559907879d489c3f2426ab2fa11eb8599 SHA512 feea5302d8724f5e199dddece214da8024a8d4bc42ebadf1bdc966df4efc1e7c8f3b17d50d0353bb10d732146afb3361c71826baf28841cf4a5174262921ecd6 WHIRLPOOL 450410f2063f8ef88e083eadab8ec794afcf7ff74a8b76fa7e9e62daa3d188b524ccf084103c108ab1f852b774185d8896298f8d59f525a596ae32a18f9ae219
+EBUILD webkit-gtk-2.4.8-r200.ebuild 10161 SHA256 476b69da58ca1fab52eddbd869db99d263450b639c51bce217f45da1ec9adcb0 SHA512 3b1f831b70ae52dfefe2cbeda34a46c3d26cc57382fea5c68c7bf8769b9675242200e9e18725f581142f38b75efac11d0bb724c52bc93f9571477c8942cdfad1 WHIRLPOOL ddbba599cb550f0bbdc6c92fc17ef75f671bd59605eafd968d1331efcb95f41f2736e3c47ba9dab33063663b506fc7a30c0dd19f02fe61d93caa8e5c29389139
+EBUILD webkit-gtk-2.4.8.ebuild 10618 SHA256 7ec3e0894e41c15e77d964ee9fa16582fceeb03f984c24656cd96a13e1171ce9 SHA512 493453d27852d6ac55172475b6bb414841c9f7db609986e31f5659a52a2eb5e5e5eaaece67d0e00ac1876bce33f50eca689006534d4d0f14191afbbf6905f85c WHIRLPOOL 9a5fdc6fff0cdcdebb7b88c73a0f2b652e5293e973aaa206ac0706fc36432badfb22b13b37e22e981d0df8c33a15be1849d6cd93a8be4a4b1375a4b18b707424
+EBUILD webkit-gtk-2.4.9-r200.ebuild 9285 SHA256 8480931dadb95b3ac61afc402725f23bab90611b88ab0e0794fe7556d7d41508 SHA512 c93059243fff08760237441ed5d201e6157065554b3475d358213d4b49e2d2c8c205d6441a3d5ad2f85bde5c1a4b58df0c4cf287559908c8f6f018e8e1ca7d2f WHIRLPOOL 3bf3ff0eadaf9c475a32705b7fb18fca3af42afd7ae85ad2b9090723a7168349fc7fa333f3b7f25bdf1d61173fd309945d6023dd1dabca899931e5727ff073fe
+EBUILD webkit-gtk-2.4.9.ebuild 9753 SHA256 2107c31e64ab9c38e7ad8976313b33563eae59a7e7d5ff93ebf6eedef831177f SHA512 ba61b11944592e7e8a583cecc0bb364c1580f814437ce35c3924aaf51c4f6f72bcdd3c68de9dd92bd3e1d67cd92385ad057ef9037fdff6f5cf1083c4b5e8e96f WHIRLPOOL 20221e7e94a3e1835bad537d53efaeb3a0d151ec9b4b56459af4e310d23b45b67aa6d833a8b64315b97ced8adce4318248bbc2be64d84df16fad68a2c55b3dd9
+EBUILD webkit-gtk-2.6.5.ebuild 6667 SHA256 98dfebc1e080341c67d8663fe4ee364757d36891072241b4c9db5bcdc5057a63 SHA512 d09aa6258541b73622fc702ee514dd3c09355e754c854f117bba0d971ab4601dda556e4d6c8cfe06e5f6086e2ca66c7bca57a0508540a0d21d653a0feb206743 WHIRLPOOL 3e5b88f2b666913f173eb94748ea0dc1908d794b31308cb3a12432e797e4a7055e2f7d29f1bae605437eee465ca4ca7111a29c72afac29fc1416c0a247365ada
+EBUILD webkit-gtk-2.6.6.ebuild 6991 SHA256 7b79bcbb7c21e47c3f03bf340203af9ab49477d5fb548c7bc045b26010a65161 SHA512 ecf0d9e9a1ab8d23187446d3fa703c4a3c229d8224ef46b5885ddf7095395d8be985921e6f3697c83f5cb4514c1583853cf039f61bd54da28908551c46ec8a17 WHIRLPOOL 2454ed22fa9c3ae5b8564d0999cc0b8372cba9df1650952baa86cffeca96403dddf5af9fb7c74a701cf53902515c1e429a3b619e16a03fd9baa47f7ebfcab25d
+EBUILD webkit-gtk-2.8.3.ebuild 7228 SHA256 baf4f73d2be3859c860c56a0b3b5d88d90e13761f3bb69e59ea7fb6c9156e236 SHA512 d335dd6cdf36fee2b6e35dd9c7bf374b75738ec82edbb206cdc82bd15944bac97aeb07bd92af9e46fde4bfcf522e26e93c37aa759c628eae3324c74f7a30d940 WHIRLPOOL 38f1e1d3ca07cf1856899bc1df68855e755ee2ebd0218d418ddfab32d3c6bec42f21a0b4bc94c99f2b2373aee9595c3874f9f0725464e4247f0b3e8fba891fba
+MISC ChangeLog 67913 SHA256 12b13bf84a0e3d832d73bbc72643378bf3f4448469cddbd81b1871f5774b5c51 SHA512 3df185ad46c0ddbd0302080c4aceb4c957a1ce8a3de5d45ebf0f8bfb114573636e2a153d0bd81184c297a3c11ca64da4a5d714f71f3626f7903d463ee36585c3 WHIRLPOOL 2d45c22d662b22f0f5c5bffa71eb8b2df12520c2f2ec850609b70766c32c7f545c3d19be71e101058a9e3fa7e8f7f0873115b5453f64526f0ad2cc45a5e4ac1b
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVjRocAAoJELp701BxlEWfsD8P/i6VwVC7Kq8wJqtz9UV29pha
-H733Z1EYMwRHUPuGxid6gY1yi1FD4ACzQ6KwcjWZsdSL+rp2tRzl8udYaKAYLdZK
-00nTLw+e5WtWqzTF3YIdi2flzOfZDtS2NxvLbT0JfbG2iW8wD4EHer0Pv8bDq8Og
-OTY8gVztSqngCCpQ/0SUTTqT/YNcYNT0Aj4rRE3x7Dgo3ouP4ZgMjhtlyvmyZjfC
-pBWAkaGj0mpTLQ8Tm7mFAiKC+jnH+LNQxoIR1AvKm6mrpU5gJl4BHCY1dPUt6XSZ
-iV65UvMGJnnHsu7JbYUUeUsajnMj4BPLt82AGz6fl9W/gfU/Nb519SK+HlZIQSDW
-FLkKBpdTCEQjOYWiVD//h5NpLuLOLdIv/qZuOPJyQ/IlKDwGguw1axSE2xEu2VXd
-dmciZPmtqj/2TXw8VcRtek9yJM9+JWJD3YoQL3aOh+jAtItym5V2L1UAGL5Ywh+5
-oANF4Gh9DFwol+57HXA1h9S7pEmTQcwtKiGqCBbJOE1LmqGz89E5rOe4TYvP6TX7
-Nc321i6zpNyYYlStvjXf0+cAOgIJzNI8vETpVxlTCpj3dG8+L14WRPmhHlQief8z
-LaDoLsF9vW0hAgjR7719fCZFmxu0n/7dMSe44U0tGgxtBpOAjtKlpPWp/oth4GzV
-axaOQjXjOOki4uUwGpcZ
-=mneV
+iQJ8BAEBCABmBQJVtGDrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNxTEP/2PtVDWBS4q86e3snyJ+ADQY
+vDDMkm0PhyiLlLUFS2hs/0fighgs0qkcKG87i9Lcwp+pM10nmpxSSiINtfpKCBhE
+3xaGrwJIPjN+hCmZWjZJP/98C8d748ySOpIlphq+SI5+CC42b6QcGDjFZquXpggF
+lgS4mbQ+T+EFg5X+WpxYUeetWg7RqYBm4BNkcp/AlqF7aO7X+24y0lsS2WzoBTS4
+GXzwMEWmpG1FNWs1vgCC1FXXmsFXvrRBsY+LhlmXlUDu8NSmNn4mpxP5qJTVl41r
+EoO0W3OslQ3xx8XEPw3v9qUiYCVwPBSsTS2I9rXmtKdR906oTovEQC7SkTFSSgIz
+ExR9on8cDrHbBcFHRy90zAtrz4X5hEZ5UPXOS/iscNg4OqF/XOts+Ttpg5DPCK3r
+/BYa8lkBpqlt8xhBoJSScMnBekG/Itedx9CI1VY52abfLEEsIHjemyfzTy0xqLu9
+qmqGU4jFFBdwmjVHbmHGwUlQ8EJqcOglOrgCMI/j5ZAR2HKyJaA5ayn1Kjdlh1az
+P8jh9mlQQ3oolqpYaVERucEBT7118r1zcTkPBQGJF+68j8L0HHI85RtzbxK5vMyt
+TcLNgF/Uusin1MESckT253pYKWWeeegU/oCr4c12lqiM3rKHL41a6+MgHeGDdzKa
+fwKtLrSpjMzKNUdGQ64l
+=QRJm
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
index 904b4edd3e2c..a458f2ae8b87 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.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/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.7 2015/04/08 18:04:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.8 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -103,7 +103,7 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
index 55a8279776c4..e3f29765949c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8.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/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.7 2015/04/08 18:04:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.8 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -109,7 +109,7 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index 049bdc13754d..e77257dbba39 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.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/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.5 2015/06/26 09:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.6 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -104,7 +104,7 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index 9348b88f8560..8e1b5cfba557 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.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/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.5 2015/06/26 09:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.6 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -113,7 +113,7 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild
index 46e32e00b55e..2c9e12f3e356 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.5.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/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild,v 1.3 2015/03/15 13:31:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild,v 1.4 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -111,13 +111,13 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+	if [[[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
 		check-reqs_pkg_setup
 	fi
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
index 54170fe03e0e..f80efef3f5d6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.6.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/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.4 2015/06/26 09:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.5 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -114,13 +114,13 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
 		check-reqs_pkg_setup
 	fi
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
index b57e101e4adc..afba3b307e03 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.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/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild,v 1.1 2015/06/09 14:34:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild,v 1.2 2015/07/26 04:24:08 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -115,13 +115,13 @@ pkg_pretend() {
 		check-reqs_pkg_pretend
 	fi
 
-	if ! test-flag-CXX -std=c++11; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
 		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
 	fi
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
 		check-reqs_pkg_setup
 	fi