Drop gles2 & wayland support following up current upstream status, bug #533704. X useflag is now not an option anymore due to wayland being removed. Make gtk-doc optional in contradiction with teams policy because upstream did some hackery that does not use gtkdoc to manipulate gtk-doc (yay :/), bug #533622.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 29 insertions, 18 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index d8aa2fb80330..efff044d25f6 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.303 2014/12/22 23:41:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.304 2014/12/31 00:38:04 eva Exp $
+
+  31 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> webkit-gtk-2.6.4.ebuild:
+  Drop gles2 & wayland support following up current upstream status, bug
+  #533704. X useflag is now not an option anymore due to wayland being removed.
+  Make gtk-doc optional in contradiction with teams policy because upstream did
+  some hackery that does not use gtkdoc to manipulate gtk-doc (yay :/), bug
+  #533622.
 
 *webkit-gtk-2.6.4 (22 Dec 2014)
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4970967956b8..92e938d13f06 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -30,13 +30,13 @@ EBUILD webkit-gtk-2.4.4-r1.ebuild 10139 SHA256 0476f812ecc1ae26251a35b5a664a54ff
 EBUILD webkit-gtk-2.4.4-r201.ebuild 9779 SHA256 5cb0960c7c35046235c6d181e20b3398c54deec16e7979e485dd5ecb5b1fcce9 SHA512 aa08f302107e2ddb121824bc52c1898341afad3f6586af7e7f2ef79532556d66393b44fead6ccddef0247bfb9b52958f6fca5c5208135019f4368e97f8571c7f WHIRLPOOL d27f55ffa7343f5c1e9ec37ce248faf22294a451001f2a81d76ebf806196fabd3e034bc5851f5c866af520eac82c13e9521cecf9ddb135c18fd79a218d5fb9ac
 EBUILD webkit-gtk-2.4.7-r200.ebuild 10133 SHA256 fde5d7d92858ba39ba825b8b823a20a0bec1dc5fb27901dcb4d751b898c85e85 SHA512 f80fe4e2b5473464dc28017faa3cb9650e689ed40df956949ebf8f1bf0635e822c5f1428672f3ad9930301c89cd9564365cf04c04c428d17e367288e88ef5e19 WHIRLPOOL 30b8785b9032eda4956fbce8e9f03e2dfc2f9190498f8e0dd3c19e3f2642028795fc35ec6137d14d03088abfb2b6676716da32b1fb60d6bb10b96b4a65e9c433
 EBUILD webkit-gtk-2.4.7.ebuild 10590 SHA256 c5450aeecbfa249b057aa38c5bcb30a8f135ca5b8253f9bb4509b00af09dcbde SHA512 aa11935a9f6eb6cc383dce9d01e21ca3f18ebe020236269da69bd08484c189e71d9faa258b785474c6c097bdf227d142da5f1fe668e350a9bc6254e1120d0d93 WHIRLPOOL d566bfb866c11d0e1d0ce73176cb28ea3d74a6f3271cdd12791c6e1ed1dca5eda2175e53b3a45a17de0a6f43466b12ec54d0bcd806b8b16f26b96460e74bdb08
-EBUILD webkit-gtk-2.6.4.ebuild 6514 SHA256 c4bc95a09c817e247b742f1a16e571fa0c64bca32a77b075d4cfebd74c3ff15b SHA512 6eb66be81a5614cd9a966034cd840a0cbbe19c810a4545f2fd973930aa1c5d9682eedb4b514d8ceeed3b546c1a6e56cc3896a10cfbd7903ebd2f630a139ff6dc WHIRLPOOL 9dae5275f9ed4059eb253ec4ad319c7f6ef91befe9a4ba2b0bec78811f9a5133fc505e8022aded05e167bcf6d8c4f1260311f91f6cfaffc680dd5eca08b41cd3
-MISC ChangeLog 63274 SHA256 c26402487120fd2702bb8f2844f79684f811428f1c97af7c0218c5303d9fa455 SHA512 8788b1b01a8fd17eef5757fc1eacbff05a5fe6e20095e59bd8764a7bdda8a35dc3fc2ea67a75da09e7c9ff6fd32011506cd87d66d33116d717ac5ee5957710f7 WHIRLPOOL 2f2f3fce66859a9bee583bc2724b5d1af1317607a144d4ea1f64ed987b59100d1891d6e563aa30989bb4bbc303570d0f1cc9ea5c85b36ad0affd72b7863d4d73
+EBUILD webkit-gtk-2.6.4.ebuild 6657 SHA256 8c5b33458648d660ba259929586fa4d3085f592b41a4575d0ec494f54a7dbf0f SHA512 10fd8057454623f7447c792baaedab8aef96a6883b26022820bdb0704003a1dab13d52a351109c2a6c46b23a52859fb7f415c50545905ec59686a769ce1c4776 WHIRLPOOL 42e0b38e15dabebc63b6fee2cd950f7fcbc2c1ae04dab72108fa93b3a01d56453731c119c6cec2c4ed9d58c8a48220fba37b11c35fa976be9b666055532c67b5
+MISC ChangeLog 63674 SHA256 608dd11c259cc9d3ed469738925876726a0be6569a3316ddd59ab4d5892a64bc SHA512 512bdcf37b13e1dc9a226efb9288568be0a82d4e3df023eddb3e49ffb82dbbcd3fc6343a34cf7fe185010e90e5f36e03187ca80beb76332fec06f5a4886eb7a1 WHIRLPOOL adbad6ca89b0e00a82227c7c8bbdd8c65482924e35443f5fe898d54e73fa0c59f5a46ccc637b9a2377f4b74ae0ab9a382f0153a12790fa81f1f06dcd3e6beae5
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSYrEIACgkQ1fmVwcYIWAbiSACePohhiDeeVTgGewTNfvoBSATD
-epwAn3bWjU/vwap7oCmGBr6aE5/KJaI3
-=dLAc
+iEYEAREIAAYFAlSjRW0ACgkQ1fmVwcYIWAZj/wCfUIAbVNkC0pkcFkR2LztvW3VL
+XLcAmwRkH1RRucsVCsKemrPGdt+VZLeO
+=vk6M
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
index 750985be8a8b..9f1466bde185 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.4.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.6.4.ebuild,v 1.1 2014/12/22 23:41:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.4.ebuild,v 1.2 2014/12/31 00:38:04 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,16 +16,17 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
+IUSE="coverage debug doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl"
+# gles2 wayland X
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
 	introspection? ( gstreamer )
-	gles2? ( egl )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( wayland X )
 "
+#	gles2? ( egl )
+#	webgl? ( ^^ ( gles2 opengl ) )
+#	!webgl? ( ?? ( gles2 opengl ) )
+#	|| ( wayland X )
 
 # use sqlite, svg by default
 # Aqua support in gtk3 is untested
@@ -44,7 +45,7 @@ RDEPEND="
 	>=media-libs/freetype-2.4.2:2
 	>=net-libs/libsoup-2.42:2.4[introspection?]
 	>=x11-libs/cairo-1.10.2:=[X]
-	>=x11-libs/gtk+-3.6.0:3[X?,introspection?]
+	>=x11-libs/gtk+-3.6.0:3[X,introspection?]
 	dev-db/sqlite:3=
 	>=x11-libs/pango-1.30.0.0
 	x11-libs/libXrender
@@ -53,7 +54,6 @@ RDEPEND="
 
 	egl? ( media-libs/mesa[egl] )
 	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
 	gstreamer? (
 		>=media-libs/gstreamer-1.2:1.0
 		>=media-libs/gst-plugins-base-1.2:1.0 )
@@ -61,12 +61,13 @@ RDEPEND="
 	libsecret? ( app-crypt/libsecret )
 	opengl? ( virtual/opengl )
 	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
 	webgl? (
 		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
 "
+#	gles2? ( media-libs/mesa[gles2] )
+#	wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
 
 # paxctl needed for bug #407085
 # Need real bison, not yacc
@@ -89,6 +90,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/make-3.82-r4
 	virtual/pkgconfig
 
+	doc? ( >=dev-util/gtk-doc-am-1.10 )
 	geoloc? ( dev-util/gdbus-codegen )
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
@@ -174,8 +176,12 @@ src_configure() {
 	# should somehow let user select between them?
 	#
 	# FTL_JIT requires llvm + libcxxabi
+	# $(cmake-utils_use_enable wayland WAYLAND_TARGET)
+	# $(cmake-utils_use_enable X X11_TARGET)
+	# $(cmake-utils_use_find_package gles2 OpenGLES2)
 	local mycmakeargs=(
 		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
 		$(cmake-utils_use_enable geoloc GEOLOCATION)
 		$(cmake-utils_use_enable gstreamer VIDEO)
 		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
@@ -183,13 +189,11 @@ src_configure() {
 		$(cmake-utils_use_enable jit)
 		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
 		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLANG_TARGET)
 		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_enable X X11_TARGET)
 		$(cmake-utils_use_find_package egl EGL)
 		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=ON
 		-DPORT=GTK
-		-DENABLE_GTKDOC=ON
 		-DENABLE_PLUGIN_PROCESS_GTK2=ON
 		${ruby_interpreter}
 	)