pacho 15/01/27 09:30:36
Modified: webkit-gtk-2.4.8.ebuild
webkit-gtk-2.4.8-r200.ebuild ChangeLog
Log:
Stop running the nvidia_check as looks to be no longer needed (thanks a lot
to nE0sIghT, Casey Webster and others for testing)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.6 net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?r1=1.5&r2=1.6
Index: webkit-gtk-2.4.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webkit-gtk-2.4.8.ebuild 25 Jan 2015 11:59:10 -0000 1.5
+++ webkit-gtk-2.4.8.ebuild 27 Jan 2015 09:30:36 -0000 1.6
@@ -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.5
2015/01/25 11:59:10 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.6
2015/01/27 09:30:36 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -102,7 +102,7 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
- nvidia_check || die #463960
+ #nvidia_check || die #463960
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with
debugging CFLAGS"
@@ -115,7 +115,7 @@
}
pkg_setup() {
- nvidia_check || die #463960
+ #nvidia_check || die #463960
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
@@ -300,19 +300,19 @@
pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
}
-nvidia_check() {
- if [[ ${MERGE_TYPE} != "binary" ]] &&
- use introspection &&
- has_version 'x11-drivers/nvidia-drivers' &&
- [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
- then
- 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
- fi
-}
+#nvidia_check() {
+# if [[ ${MERGE_TYPE} != "binary" ]] &&
+# use introspection &&
+# has_version 'x11-drivers/nvidia-drivers' &&
+# [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+# then
+# 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
+# fi
+#}
1.6 net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?r1=1.5&r2=1.6
Index: webkit-gtk-2.4.8-r200.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webkit-gtk-2.4.8-r200.ebuild 25 Jan 2015 11:59:10 -0000 1.5
+++ webkit-gtk-2.4.8-r200.ebuild 27 Jan 2015 09:30:36 -0000 1.6
@@ -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.5
2015/01/25 11:59:10 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.6
2015/01/27 09:30:36 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -96,7 +96,7 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
- nvidia_check || die #463960
+ #nvidia_check || die #463960
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with
debugging CFLAGS"
@@ -109,7 +109,7 @@
}
pkg_setup() {
- nvidia_check || die #463960
+ #nvidia_check || die #463960
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
@@ -292,19 +292,19 @@
rm -rf "${ED}usr/share/gtk-doc" || die
}
-nvidia_check() {
- if [[ ${MERGE_TYPE} != "binary" ]] &&
- use introspection &&
- has_version 'x11-drivers/nvidia-drivers' &&
- [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
- then
- 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
- fi
-}
+#nvidia_check() {
+# if [[ ${MERGE_TYPE} != "binary" ]] &&
+# use introspection &&
+# has_version 'x11-drivers/nvidia-drivers' &&
+# [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+# then
+# 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
+# fi
+#}
1.311 net-libs/webkit-gtk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.311&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.311&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.310&r2=1.311
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- ChangeLog 26 Jan 2015 20:42:35 -0000 1.310
+++ ChangeLog 27 Jan 2015 09:30:36 -0000 1.311
@@ -1,6 +1,11 @@
# 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.310
2015/01/26 20:42:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.311
2015/01/27 09:30:36 pacho Exp $
+
+ 27 Jan 2015; Pacho Ramos <[email protected]> webkit-gtk-2.4.8-r200.ebuild,
+ webkit-gtk-2.4.8.ebuild:
+ Stop running the nvidia_check as looks to be no longer needed (thanks a lot
to
+ nE0sIghT, Casey Webster and others for testing)
*webkit-gtk-2.6.5 (26 Jan 2015)
