public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: webkit-gtk-2.4.7-r200.ebuild ChangeLog webkit-gtk-2.4.7.ebuild
@ 2014-12-22 21:30 Jeroen Roovers (jer)
  0 siblings, 0 replies; only message in thread
From: Jeroen Roovers (jer) @ 2014-12-22 21:30 UTC (permalink / raw
  To: gentoo-commits

jer         14/12/22 21:30:49

  Modified:             webkit-gtk-2.4.7-r200.ebuild ChangeLog
                        webkit-gtk-2.4.7.ebuild
  Log:
  Make bad advice less crappy.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.5                  net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild?r1=1.4&r2=1.5

Index: webkit-gtk-2.4.7-r200.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- webkit-gtk-2.4.7-r200.ebuild	19 Dec 2014 13:42:17 -0000	1.4
+++ webkit-gtk-2.4.7-r200.ebuild	22 Dec 2014 21:30:49 -0000	1.5
@@ -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 @@
 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



1.302                net-libs/webkit-gtk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.302&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.302&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.301&r2=1.302

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog	19 Dec 2014 13:42:17 -0000	1.301
+++ ChangeLog	22 Dec 2014 21:30:49 -0000	1.302
@@ -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:



1.5                  net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild?r1=1.4&r2=1.5

Index: webkit-gtk-2.4.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- webkit-gtk-2.4.7.ebuild	19 Dec 2014 13:42:17 -0000	1.4
+++ webkit-gtk-2.4.7.ebuild	22 Dec 2014 21:30:49 -0000	1.5
@@ -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 @@
 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





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-12-22 21:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-22 21:30 [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: webkit-gtk-2.4.7-r200.ebuild ChangeLog webkit-gtk-2.4.7.ebuild Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox