summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-11-13 09:25:19 +0000
committerPacho Ramos <pacho@gentoo.org>2014-11-13 09:25:19 +0000
commit08ce378ea61ae1e776f3dfb937df6769cdcfef39 (patch)
tree54b66266f02ad98f87fe3d8c61dfa8720525537e /net-libs/webkit-gtk
parentMask the apulse useflag on skype for no-multilib (diff)
downloadgentoo-2-08ce378ea61ae1e776f3dfb937df6769cdcfef39.tar.gz
gentoo-2-08ce378ea61ae1e776f3dfb937df6769cdcfef39.tar.bz2
gentoo-2-08ce378ea61ae1e776f3dfb937df6769cdcfef39.zip
Hangs from bug #463960 affect many more nvidia-drivers versions
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r--net-libs/webkit-gtk/ChangeLog6
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.4.7-r200.ebuild4
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.4.7.ebuild4
3 files changed, 9 insertions, 5 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/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"