net-libs/webkit-gtk: non-unified build option doesn't work; remove

USE=-jumbo-build fails to build; remove the option for now if it
fails anyways.

Bug: https://bugs.gentoo.org/680382
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 27c7a387561f19ed4b9198ce0d1b613730608c84..0d69dc72c24f24069db3ab50ede6f571f85a0a28 100644 (file)
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -10,7 +10,6 @@
        <flag name="egl">Enable EGL support</flag>
        <flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
        <flag name="gles2">Enable GLESv2 support</flag>
-       <flag name="jumbo-build">Combine source files to speed up build process</flag>
        <flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
        <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
 </use>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
index e56d04ca4c595675815d0947f2a24a91f730f8b0..21907cebe6eaadc08300efcc8c4b99ec527be74b 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit jpeg2k +jumbo-build libnotify nsplugin +opengl spell wayland +webgl +X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
 # webgl needs gstreamer, bug #560612
 # gstreamer with opengl/gles2 needs egl
@@ -227,7 +227,7 @@ src_configure() {
        fi
 
        local mycmakeargs=(
-               -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+               #-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.0
                -DENABLE_QUARTZ_TARGET=$(usex aqua)
                -DENABLE_API_TESTS=$(usex test)
                -DENABLE_GTKDOC=$(usex doc)