Make bad advice less crappy.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 23 insertions, 19 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index cd3980cc8ce6..6a5bda5dba4f 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.301 2014/12/19 13:42:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.302 2014/12/22 21:30:49 jer Exp $
+
+  22 Dec 2014; Jeroen Roovers <jer@gentoo.org> webkit-gtk-2.4.7.ebuild,
+  webkit-gtk-2.4.7-r200.ebuild:
+  Make bad advice less crappy.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.4.7-r200.ebuild,
   webkit-gtk-2.4.7.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4b5e5766b132..ef66fa06f7af 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 10135 SHA256 deb995f0c74d612fc66058640feb841de30dfde3950d80ec682060be70212ec1 SHA512 5ef043ba50db092b4ef457dba4120e74138399f3901c058d2aa2c615204212801a033aac878001b778a11bcc3fbc19fff17036b2e5ed579d25e5a26e2ef5f35f WHIRLPOOL eb1c76b1367db72474558b5a1c302c3ce361b90863f152a464e1451b24e799edbe8834d9969862926bb927d95776d95951f4abe9eca96f90425430c9387eec9e
-EBUILD webkit-gtk-2.4.7.ebuild 10592 SHA256 9ec713fde22e2b5bacde17891984cd0764aea3b4d0161871a895f861be7ebbfa SHA512 bcba671a24c132b38ca27c2a406d8feda9c2b4a6a1224a83200a81830e08918fd807371ce462218be2b96780078d8faff179d39cc9fcb9b89cb4f6d49fb49308 WHIRLPOOL e59ac92651e84f23f16d0e8298a0953404f80d454c558c6d9516e60e1b4ca2a63783c05e0b136fce9554ae3c1084f8cfaabb46336c549e6c671b1cece64ee343
-MISC ChangeLog 62780 SHA256 5fa8e3c9e20fbb9777589b245033b036790b9f724402c5da62c88d146d7406a9 SHA512 0bd54ce6c44a3e97f624628e62e914c586472386eb75f88ea44e6cc527b9152b0419bb4aafe6164e472507d5e6e72cf5b32989e077cc65687b7d6a36cceaf0ec WHIRLPOOL f4d89a8e42fd63816381728033519ec9094e548d21ddc93731e188e121b796eff2c10199c335e2b71902ebd680ed31a99569747d710372e534534381f1a74b40
+EBUILD webkit-gtk-2.4.7-r200.ebuild 10133 SHA256 fde5d7d92858ba39ba825b8b823a20a0bec1dc5fb27901dcb4d751b898c85e85 SHA512 f80fe4e2b5473464dc28017faa3cb9650e689ed40df956949ebf8f1bf0635e822c5f1428672f3ad9930301c89cd9564365cf04c04c428d17e367288e88ef5e19 WHIRLPOOL 30b8785b9032eda4956fbce8e9f03e2dfc2f9190498f8e0dd3c19e3f2642028795fc35ec6137d14d03088abfb2b6676716da32b1fb60d6bb10b96b4a65e9c433
+EBUILD webkit-gtk-2.4.7.ebuild 10590 SHA256 c5450aeecbfa249b057aa38c5bcb30a8f135ca5b8253f9bb4509b00af09dcbde SHA512 aa11935a9f6eb6cc383dce9d01e21ca3f18ebe020236269da69bd08484c189e71d9faa258b785474c6c097bdf227d142da5f1fe668e350a9bc6254e1120d0d93 WHIRLPOOL d566bfb866c11d0e1d0ce73176cb28ea3d74a6f3271cdd12791c6e1ed1dca5eda2175e53b3a45a17de0a6f43466b12ec54d0bcd806b8b16f26b96460e74bdb08
+MISC ChangeLog 62914 SHA256 2b09bc580243c6508b5b7393170f2f5dda3716bf28c0ec39ad9cb1206fb6f445 SHA512 fd212d90fa15fd23101d9999ec83a900176a4631e04d1b15f904e7e9637eb49e597ddf0afc645b9f586a45db6a29b10631c377f1a868fdb04825979aeeb29507 WHIRLPOOL 5d67cf12835e482d5cc5063efcc8ec1679be3d3323d617d46d6c673f5e42ce62c47e82e682f284475abad2db4eed630c96f89ec5daf353770ac73b06cff9e8e9
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUKzoACgkQCaWpQKGI+9RTwwCfd+6EsxCinDoRfkHfsCrmFD18
-yvIAmgK3AQ1HamLFJzqr//iP9cV8w2Z+
-=HDnS
+iEYEAREIAAYFAlSYjYsACgkQVWmRsqeSphN+ZwCeMDFrEe7iivQAPalv2n8HQIKO
+2Y4An2x94NCpm0s9mgSuFzgN57elSR4R
+=OwD2
 -----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 702d61a3d96c..e4dbb0d21bf8 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.4 2014/12/19 13:42:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild,v 1.5 2014/12/22 21:30:49 jer Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -294,14 +294,14 @@ src_install() {
 nvidia_check() {
 	if [[ ${MERGE_TYPE} != "binary" ]] &&
 	   use introspection &&
-	   has_version '>=x11-drivers/nvidia-drivers-304.123' &&
+	   has_version 'x11-drivers/nvidia-drivers' &&
 	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
 	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
+		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
+		eerror "used as the system OpenGL library. We are very sorry about that."
+		eerror "You should temporarily select Mesa as the system OpenGL library:"
 		eerror " # eselect opengl set xorg-x11"
+		eerror " and then run emerge again."
 		eerror "See https://bugs.gentoo.org/463960 for more details."
 		eerror
 		return 1
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 6e5fecb38048..b1c668303c05 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.4 2014/12/19 13:42:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild,v 1.5 2014/12/22 21:30:49 jer Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -301,14 +301,14 @@ src_install() {
 nvidia_check() {
 	if [[ ${MERGE_TYPE} != "binary" ]] &&
 	   use introspection &&
-	   has_version '>=x11-drivers/nvidia-drivers-304.123' &&
+	   has_version 'x11-drivers/nvidia-drivers' &&
 	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
 	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
+		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
+		eerror "used as the system OpenGL library. We are very sorry about that."
+		eerror "You should temporarily select Mesa as the system OpenGL library:"
 		eerror " # eselect opengl set xorg-x11"
+		eerror " and then run emerge again."
 		eerror "See https://bugs.gentoo.org/463960 for more details."
 		eerror
 		return 1