Hangs from bug #463960 affect many more nvidia-drivers versions

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 15 insertions, 11 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 4fd94a3b8b7b..170c2b2a005d 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.298 2014/10/31 08:52:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.299 2014/11/13 09:25:19 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.4.7-r200.ebuild,
+  webkit-gtk-2.4.7.ebuild:
+  Hangs from bug #463960 affect many more nvidia-drivers versions
 
   31 Oct 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.2.6-r201.ebuild,
   webkit-gtk-2.4.4-r201.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 39f2a9d58a27..305fe747c7b8 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -23,14 +23,14 @@ EBUILD webkit-gtk-2.2.6-r1.ebuild 8940 SHA256 bfb9f50f64143891d2c02c2ba8eed96b9d
 EBUILD webkit-gtk-2.2.6-r201.ebuild 8848 SHA256 3b1f73e332a7d0b7b710ee66e38920955d41a7f5124af80220e2ebf5d371d95b SHA512 0c19bd8dd65b0926146adae6dd20a3b05bd3580694a76ccae6fc67729f60eb81cf53e137f28b548c65e5ad5f42253599fe3ccc8d33cc6f3c89f3991577ef858b WHIRLPOOL b4fb29d2ed846e4e125853c543c05b823e666ef7252cba5e0c92c928934c667a7b04da364e6abf3f10ddaaef846508452fbd079e3e98ebd6174747d6f1b45c9b
 EBUILD webkit-gtk-2.4.4-r1.ebuild 10139 SHA256 0476f812ecc1ae26251a35b5a664a54ff019c4d9f54b6c6e4cdacb3b9b2986ff SHA512 e764792dd07cce0372d3f81e49cd18a72873ff8906f178eedd1576afd43b0eeb50798dcad8729b4e92f6fbbf336a5e8aa306f524387f107864b665c55a1841ae WHIRLPOOL ad87e0109521a1f9d9f7bfc408bd182b983d19c02f02cf6d6c5a9c84910472734ff39770c47b3855695e617d377e4d34ad5409070964c1329c2858a7e300aeb6
 EBUILD webkit-gtk-2.4.4-r201.ebuild 9779 SHA256 5cb0960c7c35046235c6d181e20b3398c54deec16e7979e485dd5ecb5b1fcce9 SHA512 aa08f302107e2ddb121824bc52c1898341afad3f6586af7e7f2ef79532556d66393b44fead6ccddef0247bfb9b52958f6fca5c5208135019f4368e97f8571c7f WHIRLPOOL d27f55ffa7343f5c1e9ec37ce248faf22294a451001f2a81d76ebf806196fabd3e034bc5851f5c866af520eac82c13e9521cecf9ddb135c18fd79a218d5fb9ac
-EBUILD webkit-gtk-2.4.7-r200.ebuild 10133 SHA256 55b2e5b7a63ed4dcc878744765caed28e7a4630c7d53623911c7ef738c566d10 SHA512 423a7de125b0a1f1070283a8cd803cc7a38c426ef0b7cc4e3535ea1c0092f98a68750cb3e78c240b56a77a86ae971a5d8ec6aa024559219ba8c2907ff2796f65 WHIRLPOOL 31679bc1042ead8ddb2881c3f8fe415907adee45df86f7843a6fc81ab2c8ddc1231cb7e2e10542cc4d3fcca57e40a09a6f5980d2952e898ba4fc0c8ab7eeaaae
-EBUILD webkit-gtk-2.4.7.ebuild 10590 SHA256 67d81e6578fc287a92fbcc1461944ba8f9dfa799964d756231fee2bd0acd95bf SHA512 a0b1973a860a93ddcbe064b773e25c27caffd46ff82b7713ce66c09edfbdf7449d2a0b56a0f6275992fdb73e457754e5b91d5e3f91471e29bc577a960a77b5b1 WHIRLPOOL 4540280a324ffef9ed73512581317552cd2f483b0296db50ebb63f798b4e9c6d9337a5aa131a9d27dbf8d72fcfa6508678b57c7df9804cde48ae3c3861d0397c
-MISC ChangeLog 62350 SHA256 794913aec229d617ee41c322178d4595e35109ea351d0096893941a159cdce12 SHA512 98c8d3e82b1eaea28842b64ef8675640f598b97e9814d7e03340fe51049e91884a80671bf3809c92909158c144e1ce6d0e77be2b4d2e1adccfbd7ec19f62919e WHIRLPOOL bec192f3e2b789ffc0efc8c73c490ce868d80a018253ea1f5372c36b4ab2bf3a651fcb0fd8a348bf10335c47391c5e75f1503e9d6d13cde6d3695a1d4e9a6939
+EBUILD webkit-gtk-2.4.7-r200.ebuild 10137 SHA256 2395f60dcaf3c54978230c2dde8c21023a7a804f6078818ca793e76c4436f8da SHA512 eb1900b5720a318a82e7f9f4dcf15de7e5ceaa60193174e22a121e09786915f6745e5ca37f8e73549da297906e963259bc0439d9ff0dfdede21e118bb65004f7 WHIRLPOOL af3bcb84331e26a0dc48fe276e51951231de2abd0a258d8cb27bbe772139add69731a35d4fadc73762450b8e634ba79f60f8f6933c828c7bfdf766ee38f6a1ed
+EBUILD webkit-gtk-2.4.7.ebuild 10594 SHA256 f6185b9513a39290c4b1a1eb7073f458a5ab6f5f74a448a76a75760a380e4754 SHA512 13870c8275aa8aa0a0b14fe541e20ca7d801da260a71d6f2c09702b568497f1ddb76c58b978426e6d902de06e3d9d5ea6b898c5531d47f587d0a3d143568732d WHIRLPOOL f933f90ab9f5c317aac43cc19f2e2cf299417c1573d1cf0e8a5bb70bf37e3dde2e384b815dc5def114b2ff6856488d69c92ed9a389d10057973bb522e1a81d1a
+MISC ChangeLog 62520 SHA256 f669f05a80462dae08b0cb7c814536e754bf4e703fe83b00578c3c8be99e836d SHA512 70ca76a4b9bd3cf35fd71a0698513f8aae695a49d89d6dc66986fca63f547aa552d1962663ee380dde57d86524c638a4399df3bad5ca2d8c9d9b3c5e7210caf9 WHIRLPOOL 40c7ce0d5ea38fd89c63d7307e1f21fa2bb0a94f5f98d2e7ee3d65e3da2703fee66d67751a4cb004dfe0fd7220849f1f20eb8b9ddccffa3f8619ed0eb9db8558
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRTTdUACgkQCaWpQKGI+9QEXQCfbXwP6RbTDNu1i/jTRUipK3Xq
-MWcAn2XYlWNGUcrncG4fxd1sEJN8HPwx
-=zBDM
+iEYEAREIAAYFAlRkeQEACgkQCaWpQKGI+9RXvACggXpEX4xqbhG4d6hqRIy6GyYx
+e2wAni/po0by5CM51ExPGylItDE+3nTE
+=eO1n
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild
index e8c9ecb56421..3a0fe3d74bc6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.7-r200.ebuild,v 1.1 2014/10/25 16:14:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild,v 1.2 2014/11/13 09:25:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -294,7 +294,7 @@ src_install() {
 nvidia_check() {
 	if [[ ${MERGE_TYPE} != "binary" ]] &&
 	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
+	   has_version '>=x11-drivers/nvidia-drivers-304.123' &&
 	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
 	then
 		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild
index 3fc65464f3f6..e8d437d11c8a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.7.ebuild,v 1.1 2014/10/25 16:14:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild,v 1.2 2014/11/13 09:25:19 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -301,7 +301,7 @@ src_install() {
 nvidia_check() {
 	if [[ ${MERGE_TYPE} != "binary" ]] &&
 	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
+	   has_version '>=x11-drivers/nvidia-drivers-304.123' &&
 	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
 	then
 		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"