commit: fac1a238edb6e28d484a3d55c0f59dc973e0f262
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 2 17:27:15 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 2 17:27:15 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fac1a238
net-libs/webkit-gtk: 2.6.1 → 2.6.2
Do some ebuild cleanup as suggested by Pacho.
---
...it-gtk-2.6.1.ebuild => webkit-gtk-2.6.2.ebuild} | 38 +---------------------
1 file changed, 1 insertion(+), 37 deletions(-)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
similarity index 80%
rename from net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
index f509625..7ecc397 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.2.ebuild
@@ -103,8 +103,6 @@ S="${WORKDIR}/${MY_P}"
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
- 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"
check-reqs_pkg_pretend
@@ -116,24 +114,7 @@ pkg_pretend() {
}
pkg_setup() {
- 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
- if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
- replace-flags -ggdb -g
- ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
- ewarn "Building ${PN} with \"-ggdb\" produces binaries
which are too"
- ewarn "large for current binutils releases (bug
#432784) and has very"
- ewarn "high temporary build space and memory
requirements."
- ewarn "If you really want to build ${PN} with
\"-ggdb\", add"
- ewarn "WEBKIT_GTK_GGDB=yes"
- ewarn "to your make.conf file."
- fi
- einfo "You need to have at least 18GB of temporary build space
available"
- einfo "to build ${PN} with debugging CFLAGS. Note that it might
still"
- einfo "not be enough, as the total space requirements depend on
the flags"
- einfo "(-ggdb vs -g1) and enabled features."
+ if [[ ${MERGE_TYPE} != "binary" ]] ; then
check-reqs_pkg_setup
fi
@@ -234,20 +215,3 @@ src_install() {
use jit && pax-mark m "${ED}usr/bin/jsc"
"${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
}
-
-nvidia_check() {
- if [[ ${MERGE_TYPE} != "binary" ]] &&
- use introspection &&
- has_version '=x11-drivers/nvidia-drivers-325*' &&
- [[ $(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 " # eselect opengl set xorg-x11"
- eerror "See https://bugs.gentoo.org/463960 for more details."
- eerror
- return 1
- fi
-}
