[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Alexandre Rostovtsev]

commit:     137aa0700dd0236900ebee73d003627a69eaee40
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 06:01:17 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 06:06:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137aa070

net-libs/webkit-gtk: add 2.8.5

Tests temporarily restricted since they fail to build.

Gentoo-Bug: 556614
Package-Manager: portage-2.2.20.1

 net-libs/webkit-gtk/Manifest                |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 243 ++++++++++++++++++++++++++++
 2 files changed, 244 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 724448a..01dbc5f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
 DIST webkitgtk-2.8.3.tar.xz 10437676 SHA256 b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 SHA512 29a8f17d921a3015cea8e1e156c42b8f7d5504643157381888c9613a706070b2bde1435cc83048969cc24b525a3f7cd27a493d9636a4bace6bac921b2179874d WHIRLPOOL 03c6f1206203f79ae69c50dab085872a9920982ac556b7e611e114c4d5753ec31d7c6bf3ccf62ae08929886a02bff001a8ac74ad8a4e0ed96879f74539c0c3c4
+DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
new file mode 100644
index 0000000..e0d4164
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X"
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	>=x11-libs/gtk+-2.24.10:2
+
+	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 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+	libsecret? ( app-crypt/libsecret )
+	opengl? ( virtual/opengl )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.10
+	|| (
+		virtual/rubygems[ruby_targets_ruby20]
+		virtual/rubygems[ruby_targets_ruby21]
+		virtual/rubygems[ruby_targets_ruby22]
+		virtual/rubygems[ruby_targets_ruby19]
+	)
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	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
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="RUBY=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		ruby_interpreter="RUBY=$(type -P ruby20)"
+	else
+		ruby_interpreter="RUBY=$(type -P ruby19)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		-DENABLE_PLUGIN_PROCESS_GTK2=ON
+		${ruby_interpreter}
+	)
+	if $(tc-getLD) --version | grep -q "GNU gold"; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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}
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Alexandre Rostovtsev]

commit:     a2e60d5d6f9ff34982ea7fba32bcf2e467d2bd6d
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 05:08:14 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 05:09:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e60d5d

net-libs/webkit-gtk: missing dependency

Thanks-to: brutester
Gentoo-Bug: 554096
Package-Manager: portage-2.2.20.1

 net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild | 3 ++-
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
index b70a789..a387dec 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
@@ -60,7 +60,8 @@ RDEPEND="
 		>=media-libs/gst-plugins-base-1.2:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
 	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
 	spell? ( >=app-text/enchant-0.22:= )
 	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
 	webgl? (

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index e0d4164..e76fd72 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -64,7 +64,8 @@ RDEPEND="
 		>=media-libs/gst-plugins-base-1.2:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
 	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
 	spell? ( >=app-text/enchant-0.22:= )
 	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
 	webgl? (

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Alexandre Rostovtsev]

commit:     7d6f5d7354318ceb83f975248694ef9d24635b53
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 05:47:37 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 05:52:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6f5d73

net-libs/webkit-gtk: pass correct cmake flags when USE=gles2

Thanks-to: Gary E. Miller
Thanks-to: Kamen Dokov
Tahnks-to: Karl-Johan Karlsson
Gentoo-Bug: 554096
Package-Manager: portage-2.2.20.1

 net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild | 1 +
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
index a387dec..3450a47 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
@@ -195,6 +195,7 @@ src_configure() {
 		$(cmake-utils_use_enable doc GTKDOC)
 		$(cmake-utils_use_enable geoloc GEOLOCATION)
 		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
 		$(cmake-utils_use_enable gstreamer VIDEO)
 		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
 		$(cmake-utils_use_enable introspection)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index e76fd72..b0a6213 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -199,6 +199,7 @@ src_configure() {
 		$(cmake-utils_use_enable doc GTKDOC)
 		$(cmake-utils_use_enable geoloc GEOLOCATION)
 		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
 		$(cmake-utils_use_enable gstreamer VIDEO)
 		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
 		$(cmake-utils_use_enable introspection)

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     f81f5d633eef0da23228ac6787915d59d960b6b0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 07:54:56 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 07:54:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81f5d63

net-libs/webkit-gtk: Move again to ~ppc64 as upstream only cares about amd64/x86/>=arm7

Package-Manager: portage-2.2.20.1

 net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index 6b86fe8..d58738c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
 # bugs 372493, 416331

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     ee97f69f5d576ef66836a6752781f25e8a5c3e6a
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 07:55:37 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 07:55:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee97f69f

net-libs/webkit-gtk: Drop old

Package-Manager: portage-2.2.20.1

 net-libs/webkit-gtk/Manifest                |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild | 241 ----------------------------
 2 files changed, 242 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 01dbc5f..4c9e101 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,3 @@
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
-DIST webkitgtk-2.8.3.tar.xz 10437676 SHA256 b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 SHA512 29a8f17d921a3015cea8e1e156c42b8f7d5504643157381888c9613a706070b2bde1435cc83048969cc24b525a3f7cd27a493d9636a4bace6bac921b2179874d WHIRLPOOL 03c6f1206203f79ae69c50dab085872a9920982ac556b7e611e114c4d5753ec31d7c6bf3ccf62ae08929886a02bff001a8ac74ad8a4e0ed96879f74539c0c3c4
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
deleted file mode 100644
index 3450a47..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X"
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	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 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-	if $(tc-getLD) --version | grep -q "GNU gold"; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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}
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Alexandre Rostovtsev]

commit:     3db1b3b67ceb628afc0284dbe278366190947242
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 17:08:31 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 17:09:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db1b3b6

net-libs/webkit-gtk: cmake syntax is -DRUBY_EXECUTABLE, not RUBY

Package-Manager: portage-2.2.20.1

 net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild | 8 ++++----
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
index 0f23ff9..c4d72b7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
@@ -172,13 +172,13 @@ src_configure() {
 	local ruby_interpreter=""
 
 	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
 	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
 	fi
 
 	# TODO: Check Web Audio support

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index ae110a9..bdd69c1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -184,13 +184,13 @@ src_configure() {
 	local ruby_interpreter=""
 
 	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
 	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
 	fi
 
 	# TODO: Check Web Audio support

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     2f8b52ae65b36c8346d530a55cdc0d5f3781a850
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  7 11:06:58 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov  7 11:06:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8b52ae

net-libs/webkit-gtk: Fix ia64, bug #555504 by Émeric Maschino

Package-Manager: portage-2.2.23

 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index 56b20ba..57551d5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"
-	
+
 	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
 	use ia64 && append-ldflags "-Wl,--no-as-needed"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     be4407a7abb151076b7d14b5a5358e51f62bb796
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 20:52:22 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 21:02:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4407a7

net-libs/webkit-gtk: Version bump

Package-Manager: portage-2.2.24

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild | 247 +++++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4c9e101..7dc6c25 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
+DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 WHIRLPOOL 60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
new file mode 100644
index 0000000..3a9bbd9
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl X"
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	>=x11-libs/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	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
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		-DENABLE_PLUGIN_PROCESS_GTK2=ON
+		${ruby_interpreter}
+	)
+	if $(tc-getLD) --version | grep -q "GNU gold"; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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}
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     93cdf1a19f0316b58d43f3a6f1b3871e0d9d5dc4
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 07:30:43 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 07:30:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93cdf1a1

net-libs/webkit-gtk: dev-libs/hyphen needed as DEPEND (#565872 by Randy Tupas)

Package-Manager: portage-2.2.24

 net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
index 3a9bbd9..5ced307 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
@@ -89,6 +89,7 @@ DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.10
 	>=app-accessibility/at-spi2-core-2.5.3
 	>=dev-libs/atk-2.8.0
+	dev-libs/hyphen
 	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     25420d16e17b623c90eae8529e2472a3ef9ad85e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 21:40:51 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 21:43:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25420d16

net-libs/webkit-gtk: hyphen is not keyworded on ia64 and alpha

Package-Manager: portage-2.2.24

 net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
index 5ced307..1ff273e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl X"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     efd2dd5d58473438cbed3656d9ad56a1bc57bae8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 09:53:33 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 10:50:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd2dd5d

net-libs/webkit-gtk: enhance ebuild

Raise dependency on gcc per build system information.
Make use of toolchain-func to detect gold linker.
Make gtk+:2 optional as it is only needed for netspace plugin API.
Add missing dependency for properly switching on MPEG-TS support with gstreamer.
Add support for quartz backend that has been added in 2.10 series (untested though).

Package-Manager: portage-2.2.25

 net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild | 263 ++++++++++++++++++++++++
 1 file changed, 263 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
new file mode 100644
index 0000000..4cb2101
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	dev-libs/hyphen
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! tc-ld-is-gold ; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	local mycmakeargs=(
+		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
+		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+	if tc-ld-is-gold ; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     953a975aa23fda0630adfa440b56eb07bdba7443
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 10:30:59 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 10:30:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953a975a

net-libs/webkit-gtk: Add a comment to remember where to find dependencies updates

Package-Manager: portage-2.2.24

 net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
index 4cb2101..b8f0b0f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
@@ -39,6 +39,7 @@ RESTRICT="test"
 # use sqlite, svg by default
 # Aqua support in gtk3 is untested
 # gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+# Dependencies found at Sources/cmake/OptionsGTK.cmake
 RDEPEND="
 	dev-db/sqlite:3=
 	>=dev-libs/glib-2.36:2

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     8ddf6c70c6c3028c843a9c9641aeb7275288db9e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 10:31:37 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 10:31:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ddf6c70

net-libs/webkit-gtk: Drop old

Package-Manager: portage-2.2.24

 net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild | 248 ---------------------------
 1 file changed, 248 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
deleted file mode 100644
index 1ff273e..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl X"
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	dev-libs/hyphen
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-	if $(tc-getLD) --version | grep -q "GNU gold"; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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}
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     32f6b14f6433dd4c79e8273828e9c32ee2f7179b
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 10:27:05 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 10:27:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f6b14f

net-libs/webkit-gtk: ia64 keyword, bug #566270 by Émeric Maschino

Package-Manager: portage-2.2.26

 net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
index b8f0b0f..7b75fe3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
@@ -17,7 +17,7 @@ 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="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     582a6eb2cc914ee98cc260df72d19046e580448e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 10:28:25 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 10:28:25 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582a6eb2

net-libs/webkit-gtk: ruby19 was removed

Package-Manager: portage-2.2.26

 net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
index 7b75fe3..153acb0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 CMAKE_MAKEFILE_GENERATOR="ninja"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
 
@@ -201,10 +201,8 @@ src_configure() {
 		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
 		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
 	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
 	fi
 
 	# TODO: Check Web Audio support

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     a62079ddda10039b692df7a77fb4ec572027b2e5
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 16:15:40 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 16:15:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62079dd

net-libs/webkit-gtk: Version bump

Package-Manager: portage-2.2.27

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild | 263 +++++++++++++++++++++++++++
 2 files changed, 264 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 66b4911..c0570d3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 WHIRLPOOL 60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744
+DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
new file mode 100644
index 0000000..749979f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	dev-libs/hyphen
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! tc-ld-is-gold ; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	local mycmakeargs=(
+		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
+		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+	if tc-ld-is-gold ; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[James Le Cuirot]

commit:     15baecd79c3d9a9dd0fbd4af5782d80a446c3eb0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 21:40:59 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 21:41:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15baecd7

net-libs/webkit-gtk: Allow Ruby 2.3 when building 2.4.9 wrt #573714

No revbump because it's a build time only change and Ruby 2.3 isn't
stable anyway.

Package-Manager: portage-2.2.27

 net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild | 7 +++++--
 net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index d58738c..3678472 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby22]
+		virtual/rubygems[ruby_targets_ruby23]
 		virtual/rubygems[ruby_targets_ruby19]
 	)
 	>=dev-libs/atk-2.8.0
@@ -206,7 +207,9 @@ src_configure() {
 
 	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
 		ruby_interpreter="RUBY=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
 		ruby_interpreter="RUBY=$(type -P ruby21)"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index dcf3c45..fd95a77 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby22]
+		virtual/rubygems[ruby_targets_ruby23]
 		virtual/rubygems[ruby_targets_ruby19]
 	)
 	>=app-accessibility/at-spi2-core-2.5.3
@@ -219,7 +220,9 @@ src_configure() {
 
 	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
 		ruby_interpreter="RUBY=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
 		ruby_interpreter="RUBY=$(type -P ruby21)"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     0f7477e69d40575d887d392b8feb263db113c62b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 17:53:32 2016 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 17:53:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7477e6

net-libs/webkit-gtk: x86 stable wrt bug #566378

Package-Manager: portage-2.2.26

 net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
index 3a80ece..f0e8598 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -17,7 +17,7 @@ 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="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Lars Wendler]

commit:     18d2dbdb6692eec0bba10ef32ee645e6333ce14f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 09:50:45 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 10:04:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d2dbdb

net-libs/webkit-gtk: Security bump to version 2.10.8 (bug #577068).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild | 263 +++++++++++++++++++++++++++
 2 files changed, 264 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c0570d3..d3a7341 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,5 @@
 DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 WHIRLPOOL 60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744
 DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
+DIST webkitgtk-2.10.8.tar.xz 10994340 SHA256 313682b23f03c457b28a7ef2d5bdb70a8174cca1d32e0a853fb36fa4dcf928a9 SHA512 ec49b2549756953b25d4488f5f2c9932ac43f81febe5f24ce0e170440089aaa0326a8cf3af767d161dd6a9ee27d21748e91ee6ebc55c3143260326fe9823e924 WHIRLPOOL 4f5cb6467ee7f431e2b07d9110c754d7171ffe0c31c35b23f826da7f6058d20168a6bdf9cf865c0dda2e9a7266b0d58668922866ccf5c60f80a22ef39ad9f445
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild
new file mode 100644
index 0000000..749979f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	dev-libs/hyphen
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! tc-ld-is-gold ; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	local mycmakeargs=(
+		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
+		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+	if tc-ld-is-gold ; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     7688cbd58db4cadca3988d839993e9f8e9e2bbfa
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 21:38:14 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 21:38:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7688cbd5

net-libs/webkit-gtk: Version bump

Package-Manager: portage-2.2.28

 net-libs/webkit-gtk/Manifest                      |   2 +
 net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild      | 276 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild | 265 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild      | 276 ++++++++++++++++++++++
 4 files changed, 819 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7a338b3..2c59e22 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
+DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
+DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 WHIRLPOOL af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
new file mode 100644
index 0000000..30e76a0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libnotify
+	>=x11-libs/pango-1.30.0
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	dev-libs/hyphen
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! tc-ld-is-gold ; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		$(cmake-utils_use_enable gles2 GLES2)
+		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_enable X X11_TARGET)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+	if tc-ld-is-gold ; then
+		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+	else
+		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
new file mode 100644
index 0000000..a02bc04
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="2" # no usable subslot
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
+# bugs 372493, 416331
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua X )
+"
+
+# use sqlite, svg by default
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.5:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10:=[X]
+	>=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.30.0
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	opengl? ( virtual/opengl )
+	spell? ( >=app-text/enchant-0.22:= )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	>=sys-devel/make-3.82-r4
+	virtual/pkgconfig
+
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	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
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	# 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."
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Leave optimization level to user CFLAGS
+	# FORTIFY_SOURCE is enabled by default in Gentoo
+	sed -e 's/-O[012]//g' \
+		-e 's/-D_FORTIFY_SOURCE=2//g' \
+		-i Source/autotools/SetupCompilerFlags.m4 || die
+
+	# bug #459978, upstream bug #113397
+	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+
+	# Fix build with recent libjpeg, bug #481688
+	# https://bugs.webkit.org/show_bug.cgi?id=122412
+	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
+
+	# Fix building with --disable-webgl, bug #500966
+	# https://bugs.webkit.org/show_bug.cgi?id=131267
+	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+	AT_M4DIR=Source/autotools eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="RUBY=$(type -P ruby21)"
+	else
+		ruby_interpreter="RUBY=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# * dependency-tracking is required so parallel builds won't fail
+	gnome2_src_configure \
+		$(use_enable aqua quartz-target) \
+		$(use_enable coverage) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable geoloc geolocation) \
+		$(use_enable gles2) \
+		$(use_enable gnome-keyring credential_storage) \
+		$(use_enable gstreamer video) \
+		$(use_enable gstreamer web-audio) \
+		$(use_enable introspection) \
+		$(use_enable jit) \
+		$(use_enable opengl glx) \
+		$(use_enable spell spellcheck) \
+		$(use_enable webgl) \
+		$(use_enable webgl accelerated-compositing) \
+		$(use_enable X x11-target) \
+		--with-gtk=2.0 \
+		--disable-webkit2 \
+		--enable-dependency-tracking \
+		--disable-gtk-doc \
+		${ruby_interpreter}
+}
+
+src_compile() {
+	# Try to avoid issues like bug #463960
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# https://bugs.webkit.org/show_bug.cgi?id=129242
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Prevents crashes on PaX systems
+	use jit && pax-mark m "${ED}usr/bin/jsc-1"
+
+	# File collisions with slot 3
+	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
+	rm -rf "${ED}usr/share/gtk-doc" || die
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
new file mode 100644
index 0000000..86e8c6c
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="3/25" # soname version of libwebkit2gtk-3.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="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
+# bugs 372493, 416331
+REQUIRED_USE="
+	geoloc? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua wayland X )
+"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+# gtk3-3.10 required for wayland
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.5:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10:=[X?]
+	>=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
+	>=x11-libs/pango-1.30.0
+
+	>=x11-libs/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	opengl? ( virtual/opengl )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	>=sys-devel/make-3.82-r4
+	virtual/pkgconfig
+
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	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
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	# 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."
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Leave optimization level to user CFLAGS
+	# FORTIFY_SOURCE is enabled by default in Gentoo
+	sed -e 's/-O[012]//g' \
+		-e 's/-D_FORTIFY_SOURCE=2//g' \
+		-i Source/autotools/SetupCompilerFlags.m4 || die
+
+	# bug #459978, upstream bug #113397
+	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+
+	# Fix building on ppc (from OpenBSD, only needed on slot 3)
+	# https://bugs.webkit.org/show_bug.cgi?id=130837
+	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
+
+	# Fix build with recent libjpeg, bug #481688
+	# https://bugs.webkit.org/show_bug.cgi?id=122412
+	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
+
+	# Fix building with --disable-webgl, bug #500966
+	# https://bugs.webkit.org/show_bug.cgi?id=131267
+	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+	AT_M4DIR=Source/autotools eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="RUBY=$(type -P ruby21)"
+	else
+		ruby_interpreter="RUBY=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# * Aqua support in gtk3 is untested
+	# * dependency-tracking is required so parallel builds won't fail
+	gnome2_src_configure \
+		$(use_enable aqua quartz-target) \
+		$(use_enable coverage) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable geoloc geolocation) \
+		$(use_enable gles2) \
+		$(use_enable gnome-keyring credential_storage) \
+		$(use_enable gstreamer video) \
+		$(use_enable gstreamer web-audio) \
+		$(use_enable introspection) \
+		$(use_enable jit) \
+		$(use_enable opengl glx) \
+		$(use_enable spell spellcheck) \
+		$(use_enable webgl) \
+		$(use_enable webgl accelerated-compositing) \
+		$(use_enable wayland wayland-target) \
+		$(use_enable X x11-target) \
+		--with-gtk=3.0 \
+		--enable-dependency-tracking \
+		--disable-gtk-doc \
+		${ruby_interpreter}
+}
+
+src_compile() {
+	# Try to avoid issues like bug #463960
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# https://bugs.webkit.org/show_bug.cgi?id=129242
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     a8b2d41135d6f6b79a0478a73aea1b4bc5ea75ca
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 21:37:13 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 21:38:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b2d411

net-libs/webkit-gtk: Drop old

Package-Manager: portage-2.2.28

 net-libs/webkit-gtk/Manifest                    |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild | 262 -----------------------
 net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild    | 263 ------------------------
 3 files changed, 527 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d3a7341..7a338b3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST webkitgtk-2.10.4.tar.xz 11015164 SHA256 dbf8260da5cac0c74de2d3cce1fe7c519da3cd816a2c769cb6c6d56addd2f055 SHA512 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 WHIRLPOOL 60c789cd2802827dfa90a46debe7506c03ee0203ebbe81db53eba87994ea56ec93b1e9b61253e6411e27faca813ebb27d0ca460e980ddf983afc4e53fcb72744
 DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
-DIST webkitgtk-2.10.8.tar.xz 10994340 SHA256 313682b23f03c457b28a7ef2d5bdb70a8174cca1d32e0a853fb36fa4dcf928a9 SHA512 ec49b2549756953b25d4488f5f2c9932ac43f81febe5f24ce0e170440089aaa0326a8cf3af767d161dd6a9ee27d21748e91ee6ebc55c3143260326fe9823e924 WHIRLPOOL 4f5cb6467ee7f431e2b07d9110c754d7171ffe0c31c35b23f826da7f6058d20168a6bdf9cf865c0dda2e9a7266b0d58668922866ccf5c60f80a22ef39ad9f445
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
deleted file mode 100644
index 153acb0..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.4-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
-# Dependencies found at Sources/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	dev-libs/hyphen
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! tc-ld-is-gold ; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-	if tc-ld-is-gold ; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild
deleted file mode 100644
index 749979f..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.8.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	dev-libs/hyphen
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! tc-ld-is-gold ; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-	if tc-ld-is-gold ; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     4f1e7309629a2066aba196ac35cca646da3954ae
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 12:20:40 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 12:20:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1e7309

net-libs/webkit-gtk: amd64 stable wrt bug #577068

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
index 30e76a0..cc5453c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
@@ -17,7 +17,7 @@ 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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     4c5bb0e79a819a6a95d970bd28466fbda0d7a844
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 12:20:51 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 12:20:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5bb0e7

net-libs/webkit-gtk: amd64 stable wrt bug #570034

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
index a02bc04..6f2215f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="2" # no usable subslot
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
 # bugs 372493, 416331

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
index 86e8c6c..8cc8c7a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
 # bugs 372493, 416331

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     a5a1bb452a2e925de3d1d56b9408ebb70fb8aa4d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 10:37:26 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 10:37:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a1bb45

net-libs/webkit-gtk: x86 stable wrt bug #577068

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
index cc5453c..36f5f00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
@@ -17,7 +17,7 @@ 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="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     26b5d3b1a9d30c1ccc38af8c073e1d7025970b1c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 10:38:17 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 10:38:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b5d3b1

net-libs/webkit-gtk: x86 stable wrt bug #570034

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
index 6f2215f..6203b0f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
 # bugs 372493, 416331

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
index 8cc8c7a..88dd378 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
 # bugs 372493, 416331

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     00e6f632d2cb3eb1c55b8f80052cbf138d4df40c
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 10:02:12 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 29 10:02:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e6f632

net-libs/webkit-gtk: Drop old

Package-Manager: portage-2.3.0_rc1

 net-libs/webkit-gtk/Manifest                     |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild     | 263 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild | 285 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild      | 296 -----------------------
 4 files changed, 846 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5e5c220..460811e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,4 @@
-DIST webkitgtk-2.10.7.tar.xz 10988396 SHA256 990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e SHA512 f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b WHIRLPOOL 7cbe8c42e9c245709eee19a9a01f2a4b238596d8119e3420ca750abb3518e1333ff99a596e9f09d511773a964bafed5baa91efca7b711ddc1c91cb601c520328
 DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
 DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 WHIRLPOOL af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
-DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
deleted file mode 100644
index f0e8598..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	dev-libs/hyphen
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! tc-ld-is-gold ; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-	if tc-ld-is-gold ; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
deleted file mode 100644
index 3678472..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua X )
-"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.30.0
-
-	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 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby23]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# 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."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# Failing tests
-	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
-	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
-	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
-	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-#	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-#		-i Tools/TestWebKitAPI/GNUmakefile.am || die
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable libsecret credential_storage) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable X x11-target) \
-		--with-gtk=2.0 \
-		--disable-webkit2 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-1"
-
-	# File collisions with slot 3
-	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
-	rm -rf "${ED}usr/share/gtk-doc" || die
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
deleted file mode 100644
index fd95a77..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.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="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X?]
-	>=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	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 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby23]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# 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."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# Failing tests
-	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
-	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
-	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
-	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-#	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
-#		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
-#		-i Tools/TestWebKitAPI/GNUmakefile.am || die
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix building on ppc (from OpenBSD, only needed on slot 3)
-	# https://bugs.webkit.org/show_bug.cgi?id=130837
-	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * Aqua support in gtk3 is untested
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable libsecret credential_storage) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable wayland wayland-target) \
-		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     0e018b3b6276f8ac448ea9f97f4d2c5531e9ce5e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 10:00:46 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 29 10:00:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e018b3b

net-libs/webkit-gtk: Make repoman more happy

Package-Manager: portage-2.3.0_rc1

 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index cd463f1..2726980 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -156,7 +156,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
 
 	# https://bugs.webkit.org/show_bug.cgi?id=156510
-        eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+	eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
 
 	AT_M4DIR=Source/autotools eautoreconf
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     5554751b8a52a8b0daeb8acdf02553af2183da97
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 21:12:19 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon May 30 21:12:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5554751b

net-libs/webkit-gtk: Fix virtualx.eclass usage

Package-Manager: portage-2.3.0_rc1

 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index 2726980..12a9a11 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -238,7 +238,7 @@ src_test() {
 
 	# Tests need virtualx, bug #294691, bug #310695
 	# Parallel tests sometimes fail
-	Xemake -j1 check
+	virtx emake -j1 check
 }
 
 src_install() {

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index 0b6e646..54f43e1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -252,7 +252,7 @@ src_test() {
 
 	# Tests need virtualx, bug #294691, bug #310695
 	# Parallel tests sometimes fail
-	Xemake -j1 check
+	virtx emake -j1 check
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Tobias Klausmann]

commit:     3cec9aca645e344b5c03f8c36f0635be740467bc
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 12:32:55 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 12:32:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cec9aca

net-libs/webkit-gtk-2.10.9-r0: add ~alpha keyword

Gentoo-Bug: 566270

Package-Manager: portage-2.3.0_rc1

 net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
index 36f5f00..7b7bc8f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ 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="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     0a197ba878f249e2b654ba69a7ebaeeb3bb87f91
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 11:57:12 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 12:05:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a197ba8

net-libs/webkit-gtk: amd64 stable, bug 584468

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="amd64"

 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index 12a9a11..9db8762 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="2" # no usable subslot
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
 # bugs 372493, 416331

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index 54f43e1..edd2a85 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
 # bugs 372493, 416331

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     c474e048239f4703042b6a8430c0bf918786eacf
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 12:17:03 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 19:39:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c474e048

net-libs/webkit-gtk: x86 stable, bug 584468

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="x86"

 net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index 9db8762..10f845a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
 # bugs 372493, 416331

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index edd2a85..2ffe8b2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
 # bugs 372493, 416331

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     5f29d90dae3078e63497c2f661c7c99f12a9df50
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 15:35:34 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 15:38:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f29d90d

net-libs/webkit-gtk: Drop old

Package-Manager: portage-2.3.0_rc1

 net-libs/webkit-gtk/Manifest                      |   2 -
 net-libs/webkit-gtk/metadata.xml                  |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild | 265 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild      | 276 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild       | 251 --------------------
 5 files changed, 795 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 460811e..6a7dbb5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
 DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
-DIST webkitgtk-2.4.10.tar.xz 9867504 SHA256 33fda4b20d7fec2d6e9399ba03ef3f6d2a733c628bd77d397880c44e4bf7c614 SHA512 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 WHIRLPOOL af08ef45249313915003a150a56228b1edc25f870c149d4ece5783da302d307b40046a05bf3c157807465f248d083ebe549c48d13eefdf820eb51c2efe0f5f98
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
-DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 3d3909c..6e822e5 100644
--- 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="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support.</flag>
-	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
deleted file mode 100644
index 6203b0f..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10-r200.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua X )
-"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.30.0
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# 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."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gnome-keyring credential_storage) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable X x11-target) \
-		--with-gtk=2.0 \
-		--disable-webkit2 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-1"
-
-	# File collisions with slot 3
-	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
-	rm -rf "${ED}usr/share/gtk-doc" || die
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
deleted file mode 100644
index 88dd378..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.10.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.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="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X?]
-	>=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# 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."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix building on ppc (from OpenBSD, only needed on slot 3)
-	# https://bugs.webkit.org/show_bug.cgi?id=130837
-	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * Aqua support in gtk3 is untested
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gnome-keyring credential_storage) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable wayland wayland-target) \
-		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
deleted file mode 100644
index 94f032a..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X"
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	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 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-	if $(tc-getLD) --version | grep -q "GNU gold"; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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}
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     675099dddb08f2a53068a37293a44ad3406cd45e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 20:03:57 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 20:36:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675099dd

net-libs/webkit-gtk: ACCELERATED_2D_CANVAS is not compatible with gles2 (#588698 by skobk.in)

Package-Manager: portage-2.3.0

 net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
index 8ece5bd..5c8d595 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
@@ -226,7 +226,7 @@ src_configure() {
 
 	# support for webgl (aka 2d-canvas accelerating)
 	local canvas_enabled
-	if use webgl ; then
+	if use webgl && ! use gles2 ; then
 		canvas_enabled=ON
 	else
 		canvas_enabled=OFF

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     f392c39b16b2e23b9ab7f7749f4f479a0f8f5722
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 07:40:34 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 07:40:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f392c39b

Rename geoloc to geolocation USE (#588168), ensure gtk+-3.20 is used to fix theming (https://bugzilla.gnome.org/show_bug.cgi?id=757503).

Package-Manager: portage-2.3.0

 net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild | 273 ++++++++++++++++++++++++
 1 file changed, 273 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
new file mode 100644
index 0000000..cb799d5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="3/25" # soname version of libwebkit2gtk-3.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="aqua coverage debug +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
+# bugs 372493, 416331
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua wayland X )
+"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+# gtk3-3.10 required for wayland
+# gtk3-3.20 is needed to ensure we get fixed theming:
+# https://bugzilla.gnome.org/show_bug.cgi?id=757503
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.5:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10:=[X?]
+	>=x11-libs/gtk+-3.20.0:3[X?,aqua?,introspection?]
+	>=x11-libs/pango-1.30.0
+
+	>=x11-libs/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	opengl? ( virtual/opengl )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	>=sys-devel/make-3.82-r4
+	virtual/pkgconfig
+
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	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
+	fi
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	# 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."
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
+
+	# Leave optimization level to user CFLAGS
+	# FORTIFY_SOURCE is enabled by default in Gentoo
+	sed -e 's/-O[012]//g' \
+		-e 's/-D_FORTIFY_SOURCE=2//g' \
+		-i Source/autotools/SetupCompilerFlags.m4 || die
+
+	# bug #459978, upstream bug #113397
+	eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
+
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+
+	# Fix building on ppc (from OpenBSD, only needed on slot 3)
+	# https://bugs.webkit.org/show_bug.cgi?id=130837
+	eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
+
+	# Fix build with recent libjpeg, bug #481688
+	# https://bugs.webkit.org/show_bug.cgi?id=122412
+	eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
+
+	# Fix building with --disable-webgl, bug #500966
+	# https://bugs.webkit.org/show_bug.cgi?id=131267
+	eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=156510
+	eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+
+	AT_M4DIR=Source/autotools eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="RUBY=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="RUBY=$(type -P ruby21)"
+	else
+		ruby_interpreter="RUBY=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# * Aqua support in gtk3 is untested
+	# * dependency-tracking is required so parallel builds won't fail
+	gnome2_src_configure \
+		$(use_enable aqua quartz-target) \
+		$(use_enable coverage) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable geolocation) \
+		$(use_enable gles2) \
+		$(use_enable gnome-keyring credential_storage) \
+		$(use_enable gstreamer video) \
+		$(use_enable gstreamer web-audio) \
+		$(use_enable introspection) \
+		$(use_enable jit) \
+		$(use_enable opengl glx) \
+		$(use_enable spell spellcheck) \
+		$(use_enable webgl) \
+		$(use_enable webgl accelerated-compositing) \
+		$(use_enable wayland wayland-target) \
+		$(use_enable X x11-target) \
+		--with-gtk=3.0 \
+		--enable-dependency-tracking \
+		--disable-gtk-doc \
+		${ruby_interpreter}
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	virtx emake -j1 check
+}
+
+src_install() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# https://bugs.webkit.org/show_bug.cgi?id=129242
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     9d6d20c8ad544909ff8dc949caf26f0bde656f76
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 20:56:27 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 22:25:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6d20c8

net-libs/webkit-gtk: raise gst-plugins-bad to 1.6

Per .cmake, needed for gst-plugins-gl.

Package-Manager: portage-2.3.0

 net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
index 5c8d595..b085a29 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
 	gstreamer? (
 		>=media-libs/gstreamer-1.2:1.0
 		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
+		>=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
 	libnotify? ( x11-libs/libnotify )
 	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     56ba2e313282f7b3e1a4bacc18818f5f91e3737a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 11:21:57 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 11:21:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56ba2e31

net-libs/webkit-gtk: version bump 2.12.3 → 2.12.5

Package-Manager: portage-2.3.0

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild | 291 +++++++++++++++++++++++++++
 2 files changed, 292 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9781b21..28b42d6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
 DIST webkitgtk-2.12.3.tar.xz 11706664 SHA256 173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307 SHA512 d1a93c215cd5f2eb4d708b5a3898616d7851c57ccef473864eb5dd556909762a456e180ebe50c793959148490a80b3fe7f21fded7479b406922201ce44acf226 WHIRLPOOL 634ca12fb24355389b38f319dc37c3916af3a8b30bb97471151bf8b1baa38cec3ad0cb0aa4cc5d006b16bb737a5e18cd04e82165d1b8f952b0c018295fdc6aaf
+DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild
new file mode 100644
index 00000000..d4f2baa
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+# seccomp
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+# Control knob is private and set to off
+# seccomp? ( sys-libs/libseccomp )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     40f63de1b82d4380ad023fd32004b18bb21c16e6
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 21:46:56 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 07:03:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f63de1

net-libs/webkit-gtk: version bump 2.12.5 → 2.14.1

Package-Manager: portage-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild | 289 +++++++++++++++++++++++++++
 2 files changed, 290 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 28b42d6..491b406 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,5 @@
 DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
 DIST webkitgtk-2.12.3.tar.xz 11706664 SHA256 173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307 SHA512 d1a93c215cd5f2eb4d708b5a3898616d7851c57ccef473864eb5dd556909762a456e180ebe50c793959148490a80b3fe7f21fded7479b406922201ce44acf226 WHIRLPOOL 634ca12fb24355389b38f319dc37c3916af3a8b30bb97471151bf8b1baa38cec3ad0cb0aa4cc5d006b16bb737a5e18cd04e82165d1b8f952b0c018295fdc6aaf
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
+DIST webkitgtk-2.14.1.tar.xz 13415796 SHA256 2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5 SHA512 7b39c4f75e2fd8e5e833808597444f495ece70e79dbe49f27e4c6cbc486583954eac66b6b4324db83f2c5c92ef9f9e8f3b2c6c8046d5f326e551aecb989efa28 WHIRLPOOL e1c7db917b9a5db92613771aa98f7e29441a783b5b707c83715720291c68b357b0fc977349b6849e8c6d14b920e009fa45b5e6bf14b86c20f5ace263c33588c7
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild
new file mode 100644
index 00000000..0a5fc10
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     93e01211b50a646d2b3a24a1a0fb3da0d2dc4d29
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 21:49:32 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 07:03:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e01211

net-libs/webkit-gtk: cleanup old revisions

Package-Manager: portage-2.3.2

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild | 276 -------------------------
 net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild | 292 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild | 274 -------------------------
 4 files changed, 844 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 491b406..03113d1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST webkitgtk-2.10.9.tar.xz 10992980 SHA256 bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 SHA512 a8eda5381f227098e208a81c093f0b83f4996378e8f54ddfbe5c164254d7e1ff4a260c827e2521c748ca02bc5a691e8bbd0f59da0718cfe18812c3b257ec5228 WHIRLPOOL c6f36d4195bbd9f97358700ac446ad65d5a426ba7f0913d69163b2f37c1aedc623bdea3650f2ad7da009f1d234c9d54a163e9155794d8218342332b82ead76df
-DIST webkitgtk-2.12.3.tar.xz 11706664 SHA256 173cbb9a2eca23eee52e99965483ab25aa9c0569ef5b57041fc0c129cc26c307 SHA512 d1a93c215cd5f2eb4d708b5a3898616d7851c57ccef473864eb5dd556909762a456e180ebe50c793959148490a80b3fe7f21fded7479b406922201ce44acf226 WHIRLPOOL 634ca12fb24355389b38f319dc37c3916af3a8b30bb97471151bf8b1baa38cec3ad0cb0aa4cc5d006b16bb737a5e18cd04e82165d1b8f952b0c018295fdc6aaf
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.14.1.tar.xz 13415796 SHA256 2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5 SHA512 7b39c4f75e2fd8e5e833808597444f495ece70e79dbe49f27e4c6cbc486583954eac66b6b4324db83f2c5c92ef9f9e8f3b2c6c8046d5f326e551aecb989efa28 WHIRLPOOL e1c7db917b9a5db92613771aa98f7e29441a783b5b707c83715720291c68b357b0fc977349b6849e8c6d14b920e009fa45b5e6bf14b86c20f5ace263c33588c7
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
deleted file mode 100644
index 7b7bc8f..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.9.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	dev-libs/hyphen
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! tc-ld-is-gold ; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-	if tc-ld-is-gold ; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
deleted file mode 100644
index b085a29..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.12.3.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	epatch "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		$(cmake-utils_use_enable aqua QUARTZ_TARGET)
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gnome-keyring CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_use libnotify)
-		$(cmake-utils_use_enable nsplugin PLUGIN_PROCESS_GTK2)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
deleted file mode 100644
index 481850b..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.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="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X?]
-	>=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	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
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# 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."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# bug #459978, upstream bug #113397
-	eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix building on ppc (from OpenBSD, only needed on slot 3)
-	# https://bugs.webkit.org/show_bug.cgi?id=130837
-	eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=156510
-	eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=159124#c1
-	eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * Aqua support in gtk3 is untested
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gnome-keyring credential_storage) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable wayland wayland-target) \
-		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	virtx emake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     50fbbfd9bd177d3f5ab444478a01103b685318e9
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Wed Nov  9 10:08:06 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 12:46:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50fbbfd9

net-libs/webkit-gtk: add webkit-gtk-2.14.2.ebuild

Simple bump from 2.14.1, no relevant changes when comparing 2.14.2 and 2.14.1 tarballs
Closes: https://github.com/gentoo/gentoo/pull/2788

Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild | 289 +++++++++++++++++++++++++++
 2 files changed, 290 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 03113d1..8d0113a 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.14.1.tar.xz 13415796 SHA256 2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5 SHA512 7b39c4f75e2fd8e5e833808597444f495ece70e79dbe49f27e4c6cbc486583954eac66b6b4324db83f2c5c92ef9f9e8f3b2c6c8046d5f326e551aecb989efa28 WHIRLPOOL e1c7db917b9a5db92613771aa98f7e29441a783b5b707c83715720291c68b357b0fc977349b6849e8c6d14b920e009fa45b5e6bf14b86c20f5ace263c33588c7
+DIST webkitgtk-2.14.2.tar.xz 13416388 SHA256 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556 SHA512 e1e344660c1aa38f2911aab334581b015bdbd6fa3bef6f1cd67560b86f1b183bf91cafb94bd4783f4660ecad94dc662ec4a342d5bb2420f284150adc21f79beb WHIRLPOOL 708eb9f531ab247418556f21c6d4d73f0c698926017cbb17b1ccf342165631e887bba82e08e77ce4eae401246d401bdc3275485a4796d581f1beb02d74860c31
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
new file mode 100644
index 00000000..0a5fc10
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     927e1ec5f0b9871d5f3347309aad210e326f8056
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 03:32:26 2016 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 03:32:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927e1ec5

net-libs/webkit-gtk: Remove old

Package-Manager: portage-2.3.3

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild | 289 ---------------------------
 2 files changed, 290 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8d0113a..2349e43 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,3 @@
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
-DIST webkitgtk-2.14.1.tar.xz 13415796 SHA256 2e2d76c328de65bed6e0e4f096b2720a366654b27fc1af0830ece90bc4b7ceb5 SHA512 7b39c4f75e2fd8e5e833808597444f495ece70e79dbe49f27e4c6cbc486583954eac66b6b4324db83f2c5c92ef9f9e8f3b2c6c8046d5f326e551aecb989efa28 WHIRLPOOL e1c7db917b9a5db92613771aa98f7e29441a783b5b707c83715720291c68b357b0fc977349b6849e8c6d14b920e009fa45b5e6bf14b86c20f5ace263c33588c7
 DIST webkitgtk-2.14.2.tar.xz 13416388 SHA256 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556 SHA512 e1e344660c1aa38f2911aab334581b015bdbd6fa3bef6f1cd67560b86f1b183bf91cafb94bd4783f4660ecad94dc662ec4a342d5bb2420f284150adc21f79beb WHIRLPOOL 708eb9f531ab247418556f21c6d4d73f0c698926017cbb17b1ccf342165631e887bba82e08e77ce4eae401246d401bdc3275485a4796d581f1beb02d74860c31
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild
deleted file mode 100644
index 0a5fc10..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     83108f167fb639950a50930fc886f26857c01acb
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 15:22:26 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 15:34:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83108f16

net-libs/webkit-gtk: Version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild | 290 +++++++++++++++++++++++++++
 2 files changed, 291 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 2349e43..74d1bdc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.14.2.tar.xz 13416388 SHA256 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556 SHA512 e1e344660c1aa38f2911aab334581b015bdbd6fa3bef6f1cd67560b86f1b183bf91cafb94bd4783f4660ecad94dc662ec4a342d5bb2420f284150adc21f79beb WHIRLPOOL 708eb9f531ab247418556f21c6d4d73f0c698926017cbb17b1ccf342165631e887bba82e08e77ce4eae401246d401bdc3275485a4796d581f1beb02d74860c31
+DIST webkitgtk-2.14.3.tar.xz 13962776 SHA256 0bead450a4c92024f09008725bb3e8c3830a32c7e2983d566368c4fede9e106c SHA512 b530b84f238230f29462ef599ffd1b9a9458690ba03a78d09126bf4c4ab37b4dfb477da7c364d2446cc259720ff4743112672ebf7888b8e3ff2c8fc1271fda57 WHIRLPOOL 560b4c818ca6271eca72a31c65c11b0c42269a125e68dfac7932f40e6d108cff325e5340d6040889f429b0e6b978a2a6279432f23a0c8956af02e6ece8a61ff8
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
new file mode 100644
index 00000000..3e18145
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     869e0e4104255649421cf9f1bc11d976cce84f09
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 11:48:55 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 11:49:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869e0e41

net-libs/webkit-gtk: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild | 289 --------------------------
 net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild | 290 ---------------------------
 3 files changed, 581 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7d5f66b5af..52f40dd780 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,3 @@
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
-DIST webkitgtk-2.14.2.tar.xz 13416388 SHA256 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556 SHA512 e1e344660c1aa38f2911aab334581b015bdbd6fa3bef6f1cd67560b86f1b183bf91cafb94bd4783f4660ecad94dc662ec4a342d5bb2420f284150adc21f79beb WHIRLPOOL 708eb9f531ab247418556f21c6d4d73f0c698926017cbb17b1ccf342165631e887bba82e08e77ce4eae401246d401bdc3275485a4796d581f1beb02d74860c31
-DIST webkitgtk-2.14.3.tar.xz 13962776 SHA256 0bead450a4c92024f09008725bb3e8c3830a32c7e2983d566368c4fede9e106c SHA512 b530b84f238230f29462ef599ffd1b9a9458690ba03a78d09126bf4c4ab37b4dfb477da7c364d2446cc259720ff4743112672ebf7888b8e3ff2c8fc1271fda57 WHIRLPOOL 560b4c818ca6271eca72a31c65c11b0c42269a125e68dfac7932f40e6d108cff325e5340d6040889f429b0e6b978a2a6279432f23a0c8956af02e6ece8a61ff8
 DIST webkitgtk-2.14.4.tar.xz 13956660 SHA256 d1ae2df51dd4ee44b9b89421a436ef71062816308738c3712ecf4bec3ccbe3ac SHA512 12b5332a3879c2b240a5ae0886a25cab9ae5bc35b983f3decef9e203014e853a01eeab25c40a65f2982a8d23bccc7262ee84a9709511ddacfb73a96f769b58e4 WHIRLPOOL a5fe62ad3db45bcf80b9e29ba042200c48d3f865c42064a5931d61823a481e77d56f7108a89043313fb5aaa4f14add9ddb518d6babe5ea5a4a7a9149af9f9e9a
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
deleted file mode 100644
index e2a6920aa3..0000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.2.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
deleted file mode 100644
index fa2e89ae35..0000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     90a5a9494a97be045d94244a18d8ff38a7f051b7
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 11:48:14 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 11:49:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a5a949

net-libs/webkit-gtk: Version bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild | 288 +++++++++++++++++++++++++++
 2 files changed, 289 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 74d1bdc1f0..7d5f66b5af 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,5 @@
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.14.2.tar.xz 13416388 SHA256 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556 SHA512 e1e344660c1aa38f2911aab334581b015bdbd6fa3bef6f1cd67560b86f1b183bf91cafb94bd4783f4660ecad94dc662ec4a342d5bb2420f284150adc21f79beb WHIRLPOOL 708eb9f531ab247418556f21c6d4d73f0c698926017cbb17b1ccf342165631e887bba82e08e77ce4eae401246d401bdc3275485a4796d581f1beb02d74860c31
 DIST webkitgtk-2.14.3.tar.xz 13962776 SHA256 0bead450a4c92024f09008725bb3e8c3830a32c7e2983d566368c4fede9e106c SHA512 b530b84f238230f29462ef599ffd1b9a9458690ba03a78d09126bf4c4ab37b4dfb477da7c364d2446cc259720ff4743112672ebf7888b8e3ff2c8fc1271fda57 WHIRLPOOL 560b4c818ca6271eca72a31c65c11b0c42269a125e68dfac7932f40e6d108cff325e5340d6040889f429b0e6b978a2a6279432f23a0c8956af02e6ece8a61ff8
+DIST webkitgtk-2.14.4.tar.xz 13956660 SHA256 d1ae2df51dd4ee44b9b89421a436ef71062816308738c3712ecf4bec3ccbe3ac SHA512 12b5332a3879c2b240a5ae0886a25cab9ae5bc35b983f3decef9e203014e853a01eeab25c40a65f2982a8d23bccc7262ee84a9709511ddacfb73a96f769b58e4 WHIRLPOOL a5fe62ad3db45bcf80b9e29ba042200c48d3f865c42064a5931d61823a481e77d56f7108a89043313fb5aaa4f14add9ddb518d6babe5ea5a4a7a9149af9f9e9a
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
new file mode 100644
index 0000000000..28173a48b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	"${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Pacho Ramos]

commit:     d8d2054358bfddc4bd852c25e3d9e3b2b02ae17a
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 18:14:53 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 18:30:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d20543

net-libs/webkit-gtk: amd64/x86 stable, bug #608958

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
index 28173a48b0..3902807e37 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
@@ -16,7 +16,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     e877eb8e61c32a2a8b2446e9048a4eb7b943e402
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 08:41:17 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 08:43:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e877eb8e

net-libs/webkit-gtk: more exact local description for USE=geolocation

There was a specific flag description for USE=geoloc; retain it for USE=geolocation.
Also reindent the XML and normalize the flag description to be similar with eachother
(no period at the end)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/metadata.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 6e822e5a0d..2aec05767e 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-        <email>gnome@gentoo.org</email>
-        <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <use>
-  	<flag name="coverage">Enable code coverage support</flag>
-	<flag name="egl">Enable EGL support.</flag>
-        <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
-	<flag name="gles2">Enable GLESv2 support.</flag>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="coverage">Enable code coverage support</flag>
+	<flag name="egl">Enable EGL support</flag>
+	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
+	<flag name="gles2">Enable GLESv2 support</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
-  </use>
+</use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     bd9b427d1077d360e444052f03cef2803f307d9a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 11:25:16 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 15:36:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9b427d

net-libs/webkit-gtk: bump to 2.14.5 for serious HiDPI regression fixes

* Fix rendering of non-accelerated contents with HiDPI.
* Revert the fix for rendering issues in long documents with transparent background because it caused issues in HiDPI.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild | 288 +++++++++++++++++++++++++++
 2 files changed, 289 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 52f40dd780..9373509366 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
 DIST webkitgtk-2.14.4.tar.xz 13956660 SHA256 d1ae2df51dd4ee44b9b89421a436ef71062816308738c3712ecf4bec3ccbe3ac SHA512 12b5332a3879c2b240a5ae0886a25cab9ae5bc35b983f3decef9e203014e853a01eeab25c40a65f2982a8d23bccc7262ee84a9709511ddacfb73a96f769b58e4 WHIRLPOOL a5fe62ad3db45bcf80b9e29ba042200c48d3f865c42064a5931d61823a481e77d56f7108a89043313fb5aaa4f14add9ddb518d6babe5ea5a4a7a9149af9f9e9a
+DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c WHIRLPOOL 011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
new file mode 100644
index 0000000000..28173a48b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=net-libs/gnutls-3
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# https://bugs.webkit.org/show_bug.cgi?id=148379
+	"${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     f4771ff996151dd8d9f4b6571aa2751d8f09c157
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 08:27:38 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 08:27:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4771ff9

net-libs/webkit-gtk: amd64 stable wrt bug #608958

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
index 28173a48b0..61d6976290 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
@@ -16,7 +16,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     09e3eef7fe314c48c3a06f8258ac414e2d08919b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 08:28:06 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 08:28:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e3eef7

net-libs/webkit-gtk: x86 stable wrt bug #608958

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
index 61d6976290..3902807e37 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.14.5.ebuild
@@ -16,7 +16,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     d74d7eee2a0d946aad35828b62cd9fb638b766c5
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 19:51:16 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 19:51:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74d7eee

net-libs/webkit-gtk: remove old (security cleanup)

Gentoo-bug: 608958
Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild | 291 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild | 288 --------------------------
 3 files changed, 581 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9373509366..e65a3628ff 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST webkitgtk-2.12.5.tar.xz 11712488 SHA256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 SHA512 ec98e862c2b8799dead6ff3da8299696f6f68675c42e166ca982a83e804cce14d99196f6a14af574cb0b10166fe353dda3f347a734949efa36592f78c4b07a38 WHIRLPOOL 6913ea8acfcbb16dbaaf5575572aec9f299990c8c270ac62cd1978e8af5690dbde1c6474b0323879c8777724e3ad02e5cccae4aea298550862a5b479a6b1a6c2
-DIST webkitgtk-2.14.4.tar.xz 13956660 SHA256 d1ae2df51dd4ee44b9b89421a436ef71062816308738c3712ecf4bec3ccbe3ac SHA512 12b5332a3879c2b240a5ae0886a25cab9ae5bc35b983f3decef9e203014e853a01eeab25c40a65f2982a8d23bccc7262ee84a9709511ddacfb73a96f769b58e4 WHIRLPOOL a5fe62ad3db45bcf80b9e29ba042200c48d3f865c42064a5931d61823a481e77d56f7108a89043313fb5aaa4f14add9ddb518d6babe5ea5a4a7a9149af9f9e9a
 DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c WHIRLPOOL 011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild
deleted file mode 100644
index 5446ea5b8e..0000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.12.5.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-# seccomp
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.6.0:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-# Control knob is private and set to off
-# seccomp? ( sys-libs/libseccomp )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
deleted file mode 100644
index 3902807e37..0000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.14.4.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=148379
-	"${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     c238f006cd34d48518afa9f2752b068d49e36faf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 15:03:56 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 15:03:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c238f006

net-libs/webkit-gtk: amd64 stable wrt bug #614876

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
index 704307fbecb..f2ed4bbbbec 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     724189dcf69613a84ecfcfa83a65502f5d44a14b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 07:58:42 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 08:02:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724189dc

net-libs/webkit-gtk: x86 stable wrt bug #614876

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
index f2ed4bbbbec..96cc4e99232 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     516ea11608a0d0c6ff42d3df4fcc56c75e62fb30
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 14:17:12 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 15 14:17:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516ea116

net-libs/webkit-gtk: amd64 stable wrt bug #618420

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
index c3000ceca17..bdb8ec7060c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     dbccf5e2e7a86446e9631b91c7cd53a62f58dee7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 08:00:24 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 16 08:00:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbccf5e2

net-libs/webkit-gtk: x86 stable wrt bug #618420

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
index bdb8ec7060c..46999c045c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.2.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     17780ee1d67cc827d9284fbe032053b1ce996613
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 04:50:49 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 20 04:50:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17780ee1

net-libs/webkit-gtk: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild | 290 ---------------------------
 2 files changed, 291 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e316fd44026..78070c61914 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256 eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 WHIRLPOOL c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586
 DIST webkitgtk-2.16.2.tar.xz 14650116 SHA256 5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 SHA512 0bd16f663dffd41d713a53e2186576c4a7c42e7f872605a1688c80e8b55408b5f96f1274a1fe24624b4974240e901df5b11d1ff27a03fa2d9950575f1260abc8 WHIRLPOOL 7268820bdee088eb639e4453c683e8f6b13e7cc7093f8d4148b3911aa7ea7807291ca443b18c885de4a9a838cd80ba9247f728d1cd8106b373b4c568a918a16b
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
deleted file mode 100644
index 96cc4e99232..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	dev-libs/libgcrypt:0=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-
-	# Avoid perl[ithreads] build time requirement as that would be very very messy
-	"${FILESDIR}"/${PV}-avoid-perl-ithreads.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     699d560d397993025482777d1ddd3e403859d437
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 21:40:39 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri May 26 21:41:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699d560d

net-libs/webkit-gtk: bump to 2.16.3; includes 3 security bug fixes

Security fixes: CVE-2017-2496, CVE-2017-2539, CVE-2017-2510.
Also other bug fixes.

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild | 287 +++++++++++++++++++++++++++
 2 files changed, 288 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 78070c61914..50f03771242 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.16.2.tar.xz 14650116 SHA256 5ef689a202eb2b71141efbe8b7b53288adced90790f9f08df6e0a2ec1809f252 SHA512 0bd16f663dffd41d713a53e2186576c4a7c42e7f872605a1688c80e8b55408b5f96f1274a1fe24624b4974240e901df5b11d1ff27a03fa2d9950575f1260abc8 WHIRLPOOL 7268820bdee088eb639e4453c683e8f6b13e7cc7093f8d4148b3911aa7ea7807291ca443b18c885de4a9a838cd80ba9247f728d1cd8106b373b4c568a918a16b
+DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
new file mode 100644
index 00000000000..0822ac55bab
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	dev-libs/libgcrypt:0=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     4dc5b01eea937b31e11e411d06cf0ea1012aa962
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 16:39:30 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat May 27 16:39:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc5b01e

net-libs/webkit-gtk: amd64 stable wrt bug #619788

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
index 0822ac55bab..3c3cfceeadd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     b288a22aa9891897839fcbc5872c6abf14adba09
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  1 09:11:48 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun  1 09:13:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b288a22a

net-libs/webkit-gtk: x86 stable wrt bug #619788

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
index 3c3cfceeadd..821d3c00883 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     e58ce23fccaa302307ba142c460610e73dc5de1a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 07:08:08 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 07:08:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58ce23f

net-libs/webkit-gtk: bump to 2.16.4 for bug fixes, including a security fix

Fixes CVE-2017-2538 among other bug fixes

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild | 288 +++++++++++++++++++++++++++
 2 files changed, 289 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b0ceed885d2..a7753d75c91 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f
+DIST webkitgtk-2.16.4.tar.xz 14655288 SHA256 f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128 SHA512 9643b40f5425cb6c13daf39cbe66db7103e588c8a6a1822709d1b2d24ddf73662c139337327a403c25678cec96df7e5ccf186c14aca162b6f32b5bc31310709c WHIRLPOOL ac6300646017eaa8d68b4628b3df6cb4b82c6fdf7472c07e6cdba0e0bd55cc1ad8d15e779d528c89477363292586be0e48d01c977dad9dd05269f37c415a4fa5
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
new file mode 100644
index 00000000000..2c100975823
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	dev-libs/libgcrypt:0=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     7cd0ec901e6fc7cf421852e342f236578c575a8e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 16:31:29 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 16:31:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd0ec90

net-libs/webkit-gtk: amd64 stable wrt bug #622442

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
index 2c100975823..34f2ce9f3ad 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     873439d6af5263f1a4aaf6b4a5b09329f5471295
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 18:19:55 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 18:20:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873439d6

net-libs/webkit-gtk: bump to 2.16.5 for a crash and a wayland regression fix

Upstream changes:
* Fix a web process crash when page finishes loading in several web sites.
* Fix the menu of select elements not showing in some cases under Wayland.

This is meant to be the security stabilization target for CVE-2017-2538 for
a regression free upgrade

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 288 +++++++++++++++++++++++++++
 2 files changed, 289 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a7753d75c91..d27d03ac0c6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f
 DIST webkitgtk-2.16.4.tar.xz 14655288 SHA256 f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128 SHA512 9643b40f5425cb6c13daf39cbe66db7103e588c8a6a1822709d1b2d24ddf73662c139337327a403c25678cec96df7e5ccf186c14aca162b6f32b5bc31310709c WHIRLPOOL ac6300646017eaa8d68b4628b3df6cb4b82c6fdf7472c07e6cdba0e0bd55cc1ad8d15e779d528c89477363292586be0e48d01c977dad9dd05269f37c415a4fa5
+DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
new file mode 100644
index 00000000000..2c100975823
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	dev-libs/libgcrypt:0=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     aa68b1f297810c1a1e2ba59556b5adfa70c0c487
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 13:18:52 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 13:18:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa68b1f2

net-libs/webkit-gtk: amd64 stable wrt bug #622442

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
index 2c100975823..34f2ce9f3ad 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     7e342cbd9a69582da5699794a5a3f1c0f38b1751
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 11:08:30 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 11:08:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e342cbd

net-libs/webkit-gtk: x86 stable wrt bug #622442

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
index 34f2ce9f3ad..15fc0291446 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Alexis Ballier]

commit:     5ffed86c578c7afa1f89399f8171444646a86c23
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 15:34:09 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 15:34:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffed86c

net-libs/webkit-gtk: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
index 15fc0291446..44c39f36968 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     56a91dcd1de6f087a54242db6cd2e6eb171586bb
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 19:47:09 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 19:47:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a91dcd

net-libs/webkit-gtk: security cleanup

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild | 287 --------------------------
 net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild | 288 ---------------------------
 3 files changed, 577 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d27d03ac0c6..4abc7af28cc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST webkitgtk-2.16.3.tar.xz 14652068 SHA256 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 SHA512 551367551ed1bceaf9c70269f229e97972706820c6ae2d4444bc6d8b0992d6de34a156f9c245813c1f1701ce54f5476a44512590acfa6cfd6e67663d94caa91e WHIRLPOOL bac846be9d5f7b0a4c08b201d338bed6b84e65bdb105f2689350e02e0f0011944f5e23961e9411f712040c26a5313ef9bb4e30dda2cb19216c8e8d665ab0550f
-DIST webkitgtk-2.16.4.tar.xz 14655288 SHA256 f9aba4338319bd539785345144e28c8027dc8cb526b2e443e0c8f2c0239f5128 SHA512 9643b40f5425cb6c13daf39cbe66db7103e588c8a6a1822709d1b2d24ddf73662c139337327a403c25678cec96df7e5ccf186c14aca162b6f32b5bc31310709c WHIRLPOOL ac6300646017eaa8d68b4628b3df6cb4b82c6fdf7472c07e6cdba0e0bd55cc1ad8d15e779d528c89477363292586be0e48d01c977dad9dd05269f37c415a4fa5
 DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
deleted file mode 100644
index 821d3c00883..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.3.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	dev-libs/libgcrypt:0=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
deleted file mode 100644
index 34f2ce9f3ad..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.4.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	dev-libs/libgcrypt:0=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     12cc94e10688796949b18c8d1f0abf682dca8d1e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 18:02:18 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 18:03:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12cc94e1

net-libs/webkit-gtk: bump to 2.16.6 for security fixes

Fixes CVE-2017-7018, CVE-2017-7030, CVE-2017-7034, CVE-2017-7037,
CVE-2017-7039, CVE-2017-7046, CVE-2017-7048, CVE-2017-7055,
CVE-2017-7056, CVE-2017-7061 and CVE-2017-7064.

Gentoo-bug: 626142
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild | 288 +++++++++++++++++++++++++++
 2 files changed, 289 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4abc7af28cc..8ee679e6755 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd
+DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
new file mode 100644
index 00000000000..2db2e98ea42
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	dev-libs/libgcrypt:0=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	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"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Tobias Klausmann]

commit:     f7f6953ea75c3bbfb705accde516368b16b4f478
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 12:21:43 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 12:56:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7f6953e

net-libs/webkit-gtk-2.16.6-r0: amd64 stable

Gentoo-Bug: 626142

 net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
index 2db2e98ea42..43cee459381 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     6caf4a03da8502a1fd37c2abe8f47be8841b1a1b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 00:09:14 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 00:30:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6caf4a03

net-libs/webkit-gtk: x86 stable (bug #626142)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
index 43cee459381..44c39f36968 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Gilles Dartiguelongue]

commit:     7eb0f70f64ae75ab1c3d4e2c8eeed7e7fa713e88
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 07:37:56 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 07:56:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb0f70f

net-libs/webkit-gtk: cleanup security vulnerable 2.16.5, bug #626142

Bug: https://bugs.gentoo.org/show_bug.cgi?id=626142
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild | 288 ---------------------------
 2 files changed, 289 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8ee679e6755..85828c2eb8e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.16.5.tar.xz 14655656 SHA256 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 SHA512 9d7573da44267edcd83b4918e5f1e0516eb8d84c58ac6b239a2328448f96b39067b62bcd18e7d730ec0ef44b9f4b0a03712d17f9f465f00346a1f45a0a4ebb10 WHIRLPOOL 76fc7cc7dfb326d3600396bc1e486acd26cca1eda779d9a06ad123c60f8cba9eee162b626abe95a09c9e8ed0b308f341a818ebf833f6b902812c644e5925aacd
 DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
deleted file mode 100644
index 44c39f36968..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.5.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	dev-libs/libgcrypt:0=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	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"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     3f02025658b5764b88a248af0a0cb408d6e72b57
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 21:59:55 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 22:22:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f020256

net-libs/webkit-gtk: bump to 2.18.1 for security; other package touchups

- reorder deps to cmake checks order
- add missing zlib dep
- move gtk platform USE checks to the main depstring, as that's requiring newer version anyway
- remove unnecessary pango dep (not checked in cmake, minimal usage comes via gtk+ deps)
- add WebCrypto deps, without giving optionality (it's a private option)
- add missing cmake-utils_src_prepare call
- remove ancient <glibc-2.18 code
- fix jsc pax-mark
- remove ruby21 support (gone from tree and repoman warning about the slot)
- GL deps and conditions remain a mystery to me for now

Closes: https://bugs.gentoo.org/626736
Package-Manager: Portage-2.3.8, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/metadata.xml             |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild | 284 +++++++++++++++++++++++++++
 3 files changed, 286 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 85828c2eb8e..0792964cb44 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
+DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 2aec05767e2..9a96619fdf3 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -11,6 +11,7 @@
 	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support</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>
 </pkgmetadata>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
new file mode 100644
index 00000000000..678d8b2d051
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     16fca2dd392910b7a773caace8126b4293695ed0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:45:11 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:45:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16fca2dd

net-libs/webkit-gtk: USE=gstreamer,egl requires gst-plugins-bad[egl] now

If EGL is enabled, then the gstreamer code (only compiled with USE=gstreamer) will
want to include gstreamer egl headers, in addition to gst gl headers

Bug: https://bugs.gentoo.org/635144
Package-Manager: Portage-2.3.8, Repoman-2.3.2

 net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
index 678d8b2d051..2be3f452f74 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
@@ -69,7 +69,7 @@ RDEPEND="
 	gstreamer? (
 		>=media-libs/gstreamer-1.2.3:1.0
 		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?] )
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
 
 	X? (
 		x11-libs/cairo[X]

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     cd3fd56e8d5fb09ef9eb71665836ab70d06d5fb6
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 20:08:39 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 23:32:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3fd56e

net-libs/webkit-gtk: bump to 2.18.2

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild | 284 +++++++++++++++++++++++++++
 2 files changed, 285 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0792964cb44..00ca6f02116 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
 DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
+DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
new file mode 100644
index 00000000000..2be3f452f74
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     2dd51d3343c9def89c51c7c97a45cdfcd2332638
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 15:55:08 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 15:55:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd51d33

net-libs/webkit-gtk: amd64 stable wrt bug #635134

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
index 2be3f452f74..1173b43e82d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     504aa9a6e8c8072b65a39a38aeba424245b28d38
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 21:07:16 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 21:08:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504aa9a6

net-libs/webkit-gtk: x86 stable (bug #635134)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
index 1173b43e82d..b05d77618c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Ian Stakenvicius]

commit:     3dd23d4bc9222af04ce0e307a1eebe0dbc744bca
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 17:31:21 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 17:31:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd23d4b

net-libs/webkit-gtk: bump to 2.18.3 for security

Bug: https://bugs.gentoo.org/637076
Acked-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild | 284 +++++++++++++++++++++++++++
 2 files changed, 285 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index eafc5261138..dc75e12ae36 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
+DIST webkitgtk-2.18.3.tar.xz 14824668 SHA256 e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e WHIRLPOOL 1151c09119bfbb213bb3cd291f3ddcc49e3c9f77396bc960e381754e564d72ea21e70641f3cd57f42b2dcb77c05fd92e158b02b0ae94fade22129d8ae114524a
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
new file mode 100644
index 00000000000..2be3f452f74
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     b1b62f3d96d775a54a815667d5f6159030381849
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 13:22:43 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 13:22:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b62f3d

net-libs/webkit-gtk: amd64 stable wrt bug #637076

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 | 6 +++---
 net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index dc75e12ae36..fd9fefe0548 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,3 @@
-DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
-DIST webkitgtk-2.18.3.tar.xz 14824668 SHA256 e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e WHIRLPOOL 1151c09119bfbb213bb3cd291f3ddcc49e3c9f77396bc960e381754e564d72ea21e70641f3cd57f42b2dcb77c05fd92e158b02b0ae94fade22129d8ae114524a
-DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
+DIST webkitgtk-2.18.2.tar.xz 14823612 BLAKE2B 11e2e4117c73195fe00f1d1600645ed636c1232d2b9247900a2ed4e7c4acb45d60de1c12bde194a090d62960cf17a20ec634e1252ebc07b288dc35950667d360 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c
+DIST webkitgtk-2.18.3.tar.xz 14824668 BLAKE2B 1ae21d17084a27465c462171f043f2d776398ea077e5dbf0d20769143495290990da91120df5fe9dcae426c7a87232a466d198b69f05cadd336fa6a30db3d549 SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e
+DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
index 2be3f452f74..1173b43e82d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     b597f295c9f01b5b2d25954330fb039366753323
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 23:17:04 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 00:19:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b597f295

net-libs/webkit-gtk: x86 stable (bug #637076)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
index 1173b43e82d..b05d77618c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Manuel Rüger]

commit:     62eeb40713550035e44586334620fb337a94ae44
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 17:33:37 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 17:33:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62eeb407

net-libs/webkit-gtk: Remove vulnerable 2.18.2 as requested by leio

Bug: https://bugs.gentoo.org/637076
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild | 284 ---------------------------
 2 files changed, 285 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index fd9fefe0548..8aaf23ad6cc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.18.2.tar.xz 14823612 BLAKE2B 11e2e4117c73195fe00f1d1600645ed636c1232d2b9247900a2ed4e7c4acb45d60de1c12bde194a090d62960cf17a20ec634e1252ebc07b288dc35950667d360 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c
 DIST webkitgtk-2.18.3.tar.xz 14824668 BLAKE2B 1ae21d17084a27465c462171f043f2d776398ea077e5dbf0d20769143495290990da91120df5fe9dcae426c7a87232a466d198b69f05cadd336fa6a30db3d549 SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
deleted file mode 100644
index b05d77618c6..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
-
-	X? (
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     2037d637f2b5fa504fad32fa8628044050ffb603
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 13:54:53 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 13:58:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2037d637

net-libs/webkit-gtk: security bump to 2.18.4

Bug: https://bugs.gentoo.org/641752
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild | 284 +++++++++++++++++++++++++++
 2 files changed, 285 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8aaf23ad6cc..97eea071829 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.18.3.tar.xz 14824668 BLAKE2B 1ae21d17084a27465c462171f043f2d776398ea077e5dbf0d20769143495290990da91120df5fe9dcae426c7a87232a466d198b69f05cadd336fa6a30db3d549 SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e
+DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
new file mode 100644
index 00000000000..2be3f452f74
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     c17b45b5bdd7d9db2d2e40bfdf893be7480d88f7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 21:19:20 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 21:19:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17b45b5

net-libs/webkit-gtk: x86 stable (bug #641752)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
index 2be3f452f74..e25e0fccfa3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     eb23fdd0b969e7b252d1deb5be228cf5a93a1a12
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 08:51:53 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 08:51:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb23fdd0

net-libs/webkit-gtk: amd64 stable wrt bug #641752

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
index e25e0fccfa3..b05d77618c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     1e7e9386980fdf244980b36ef60bf7f050094848
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 20:23:58 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 20:23:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7e9386

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/641752
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild | 284 ---------------------------
 2 files changed, 285 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 97eea071829..7ff9ffc645f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.18.3.tar.xz 14824668 BLAKE2B 1ae21d17084a27465c462171f043f2d776398ea077e5dbf0d20769143495290990da91120df5fe9dcae426c7a87232a466d198b69f05cadd336fa6a30db3d549 SHA512 8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e
 DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
deleted file mode 100644
index b05d77618c6..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
-
-	X? (
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     985a787359c84f142eb47005244b681ebc35b2be
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 13:52:15 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 13:52:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=985a7873

net-libs/webkit-gtk: security bump to 2.18.5 for Spectre mitigation

Bug: https://bugs.gentoo.org/644128
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild | 284 +++++++++++++++++++++++++++
 2 files changed, 285 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7ff9ffc645f..a3399a14edc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
+DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
new file mode 100644
index 00000000000..31abd5c34d4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     136562e66275cb941875d5b93e42ff83e1a0da86
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 20:10:53 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 20:11:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136562e6

net-libs/webkit-gtk: x86 stable (bug #644128)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
index 31abd5c34d4..8bf4a9f17cb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     d89aa33210793e986528124ee7f845a17227ba8d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 15:30:47 2018 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 15:30:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89aa332

net-libs/webkit-gtk: amd64 stable wrt bug #644128

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
index 8bf4a9f17cb..c49d26d006a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     f29a87fb51e655797c146b3f5120c47401572a5a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 18:19:13 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 18:19:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f29a87fb

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/644128
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild | 284 ---------------------------
 2 files changed, 285 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a3399a14edc..66de009b36d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
 DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
deleted file mode 100644
index b05d77618c6..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
-
-	X? (
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     e839f061037f360a5a35e2ef7d307adc0678e185
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 14:03:38 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 14:37:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e839f061

net-libs/webkit-gtk: default enable USE=X in preparation of use.force removal

Bug: https://bugs.gentoo.org/643724
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
index c49d26d006a..1d2bca38691 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 
 # webgl needs gstreamer, bug #560612
 REQUIRED_USE="

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 31abd5c34d4..300736415c5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 
 # webgl needs gstreamer, bug #560612
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     2731d7a81444b0743caae7453e0c0e168005c828
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 13:53:03 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 14:37:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2731d7a8

net-libs/webkit-gtk: security bump to 2.18.6

Bug: https://bugs.gentoo.org/645686
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 284 +++++++++++++++++++++++++++
 2 files changed, 285 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 66de009b36d..d2c7b1f32c6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
+DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
new file mode 100644
index 00000000000..31abd5c34d4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     65a429ca2471994694b76a3b2fec74215a336044
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 18:16:19 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 18:16:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a429ca

net-libs/webkit-gtk: x86 stable (bug #645686)

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 300736415c5..0e48cc9ffb8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     97288a0a0424ca523e96cb6c51851d8a3a3f4e40
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 23:33:18 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 23:35:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97288a0a

net-libs/webkit-gtk: amd64 stable wrt bug #645686

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 0e48cc9ffb8..1d2bca38691 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     04c3a2dc0ac9c55ce059caca8cb2db8c90ceb335
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 01:38:22 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 01:46:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c3a2dc

net-libs/webkit-gtk: security cleanup

https://bugs.gentoo.org/645686

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild | 284 ---------------------------
 2 files changed, 285 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d2c7b1f32c6..8c34d62d55d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
deleted file mode 100644
index 1d2bca38691..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
-
-	X? (
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Aaron Bauman]

commit:     dd3cb769609ef65c0fc372433d22f5f53af69652
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Apr 27 13:23:03 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May  5 01:25:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3cb769

net-libs/webkit-gtk: use HTTPS

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 1d2bca38691..b1e098d1910 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -10,8 +10,8 @@ inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     5460bcf7121bdbea444afe3b4998a2758c918e37
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 18:22:04 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5460bcf7

net-libs/webkit-gtk-2.20.3: add missing new perl JSON::PP build dep

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 5990cd0d5ea..6eaa8ebba7c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -110,6 +110,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	virtual/perl-Data-Dumper
 	virtual/perl-Carp
+	virtual/perl-JSON-PP
 
 	doc? ( >=dev-util/gtk-doc-1.10 )
 	geolocation? ( dev-util/gdbus-codegen )

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     8803068b11340f0bc7c1d0b9f157c3605ec84a9b
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 12:59:55 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8803068b

net-libs/webkit-gtk: bump to 2.20.3

* New dependency on media-libs/woff2 require us to drop keywords
* Drop redundant python dependency under tests
* The ia64 patch is no longer needed: the fatal build error on unknown
  CPUs has been removed.
* arm64 compilation is fixed upstream.

Closes: https://bugs.gentoo.org/655550
Closes: https://bugs.gentoo.org/644284
Closes: https://github.com/gentoo/gentoo/pull/9271
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 283 +++++++++++++++++++++++++++
 2 files changed, 284 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 06548c5f961..2e953f14cf6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
+DIST webkitgtk-2.20.3.tar.xz 16623456 BLAKE2B 3ae9441287f4af04d2d7e2c490b262b5619f1b47962f16e34589f81f24dfd6b2e4dd3b6c98ce8fc2582c288a5afa492613a36273853cee5bf58946355febb07e SHA512 69a7b27e294de6fd43240ce1d314cd1ccdbf29674c97967674459fd02720b31fa53e5412efbd93dc1e805d38e38feb7fe9a12cdd9c472471676b8db3c11734de

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
new file mode 100644
index 00000000000..d07aadc54b8
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+
+	X? (
+		x11-libs/cairo[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     d483cbb1072349e4de5780868302517cce0c8f0d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 18:25:22 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d483cbb1

net-libs/webkit-gtk: remove unused versionator and eutils inherits

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 6eaa8ebba7c..56fbc1c1f50 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -6,7 +6,7 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python2_7 )
 USE_RUBY="ruby23 ruby24 ruby25"
 
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     0ef939500fc5ea10e291e8097a5f25b90fc1bb88
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 13:42:09 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef93950

net-libs/webkit-gtk: comment out unused test deps

Tests are restricted anyways, so hide the extra deps from repoman and co

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index af0b97e336e..189dd47e268 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -112,11 +112,11 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1.10 )
 	geolocation? ( dev-util/gdbus-codegen )
 	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
 "
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
 
 S="${WORKDIR}/${MY_P}"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     5721aab07bc4778c8667ca9ff8a330eae5d41b2c
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 13:05:47 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5721aab0

net-libs/webkit-gtk: add support for ruby25

Also, improve ruby interpreter detection logic.

Closes: https://bugs.gentoo.org/659130
Bug: https://bugs.gentoo.org/513888
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index d07aadc54b8..5990cd0d5ea 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
 
@@ -188,17 +188,17 @@ src_configure() {
 	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
 	append-flags $(test-flags -fno-strict-aliasing)
 
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
 	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     46804b6b4d3c239fb3d0440e4e99b73b8cc6c55a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 22:15:00 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46804b6b

net-libs/webkit-gtk-2.20.3: restore ~arm and ~sparc keywords

They've keyworded media-libs/woff2 since the start of work on webkit-gtk bump.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 761afd90ed4..e81c152cefa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~sparc"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     73d95b14d48bc96582f3dca2029ffdf790d1aafd
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 09:36:00 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d95b14

net-libs/webkit-gtk-2.20.3: disable experimental accelerated 2D canvas

ACCELERATED_2D_CANVAS is considered experimental by upstream. I'm not sure
what the justification was for enabling it with USE="webgl opengl" for us.
The only reason this code isn't removed fully from upstream is because it
_MIGHT_ be useful for some embedded use cases, yet it doesn't work with
GLES2 yet, only desktop opengl.
Additionally, for us this is causing additional cairo[opengl] dependency
that can't be avoided for just non-experimental WebGL support via desktop
GL as it was setup before in ebuild. No-one but Gentoo is building with
this experimental option (not even upstream developers), and any issues
about it won't really be cared about.
Disable it and drop the cairo[opengl] dependency.

https://lists.webkit.org/pipermail/webkit-gtk/2017-March/002969.html
https://lists.webkit.org/pipermail/webkit-gtk/2017-April/003004.html

If this is ever added back for any reason, make sure cairo[opengl] isn't
depended on when not necessary (when accelerated 2d canvas is disabled,
e.g. previously USE="opengl gles2" pulled in cairo[opengl] still, albeit
that combination was not allowed previously, but a future webkit-gtk
upstream version may support them together) and review if cairo-glesv2
is supported (and so it'd be supported with USE=gles2 too, unlike now).

Bug: https://bugs.gentoo.org/581248
Closes: https://bugs.gentoo.org/643726
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 56fbc1c1f50..af0b97e336e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -41,7 +41,7 @@ RESTRICT="test"
 # Various compile-time optionals for gtk+-3.22.0 - ensure it
 # Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
 RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/cairo-1.10.2:=[X?]
 	>=media-libs/fontconfig-2.8.0:1.0
 	>=media-libs/freetype-2.4.2:2
 	>=dev-libs/libgcrypt-1.6.0:0=
@@ -73,7 +73,6 @@ RDEPEND="
 		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
 
 	X? (
-		x11-libs/cairo[X]
 		x11-libs/libX11
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
@@ -85,10 +84,8 @@ RDEPEND="
 
 	egl? ( media-libs/mesa[egl] )
 	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
+	opengl? ( virtual/opengl )
 	webgl? (
-		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
 "
@@ -215,14 +212,6 @@ src_configure() {
 		opengl_enabled=OFF
 	fi
 
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
 	local mycmakeargs=(
 		-DENABLE_QUARTZ_TARGET=$(usex aqua)
 		-DENABLE_API_TESTS=$(usex test)
@@ -245,7 +234,6 @@ src_configure() {
 		$(cmake-utils_use_find_package opengl OpenGL)
 		-DENABLE_X11_TARGET=$(usex X)
 		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
 		-DCMAKE_BUILD_TYPE=Release
 		-DPORT=GTK
 		${ruby_interpreter}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     7f268cbd114024d9dad9cdfe241e83a9f1716b82
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 13:09:10 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 22:23:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f268cbd

net-libs/webkit-gtk: simplify opengl vs gles2 handling, fix gst gles2 deps

webkit-gtk itself does not support both full OpenGL and GLESv2 at once yet.
ENABLE_OPENGL enables OpenGL in general, and if enabled then ENABLE_GLES2
determines which API is used - if enabled, then gles2, otherwise full GL.
Simplify REQUIRED_USE handling to enforce the opengl/gles2 conflict
separately, and have the webgl case just want either, to be future-proof
and easier to read independently.

WebGL should just always be enabled when either GL API is enabled, but
keeping it under USE flag for the time being, until an even deeper
GL/GStreamer webkitgtk cmake review, due to the webgl? ( gstreamer )
REQUIRED_USE still present.
For now just (probably) properly depend on gstreamer gles2 support for
USE="gles2 gstreamer" builds.

Bug: https://bugs.gentoo.org/500150
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 189dd47e268..761afd90ed4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -22,12 +22,11 @@ IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +intros
 # webgl needs gstreamer, bug #560612
 REQUIRED_USE="
 	geolocation? ( introspection )
-	gles2? ( egl )
+	gles2? ( egl !opengl )
 	introspection? ( gstreamer )
 	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
 	wayland? ( egl )
 	|| ( aqua wayland X )
 "
@@ -70,7 +69,7 @@ RDEPEND="
 	gstreamer? (
 		>=media-libs/gstreamer-1.2.3:1.0
 		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
+		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
 
 	X? (
 		x11-libs/libX11

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     5c9f1cbeb71cb84b5522b5128293ea12da5b55e6
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 09:25:27 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 09:28:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9f1cbe

net-libs/webkit-gtk-2.20.3: restore ~prefix and ~arm64 keywords

They have woff2 keyworded now.
prefix has other issues in a big set of profiles, but this dropping
was about woff2, so just restore them still and let them deal with
it when anyone notices.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index e81c152cefa..69dc6b1f2ca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     f0c3c20208fe7228d021ca89875796c799a053f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 16:15:58 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 16:15:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c3c202

net-libs/webkit-gtk: x86 stable (bug #652820)

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 50b4f8c388c..b73bf37618c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     ebca05e674776c26c3309b0a8d5661b78b06640c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 30 09:20:37 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 30 09:20:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebca05e6

net-libs/webkit-gtk-2.20.3: restore ~ia64 keyword

media-libs/woff2 received ~ia64 keyword, so bring it back here as well.
Hopefully someone actually builds the upgrade and sees if things still
work after the WTF_CPU_IA64 patch drop (as "unknown CPU" error was
removed upstream).

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index b73bf37618c..08d9e656778 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     1039d8ab3f5dd1462248f38acbcc0a30695918d2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 30 20:52:08 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul 30 20:52:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1039d8ab

net-libs/webkit-gtk: amd64 stable wrt bug #652820

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 08d9e656778..fa06898ad58 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     bd21d100ddd03097bdb4bf51655141c5d9100121
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 30 21:16:36 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jul 30 21:16:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd21d100

net-libs/webkit-gtk: partial security cleanup

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index b1e098d1910..7d945826be7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~ppc ~ppc64 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     4275ca5446ae658e7826bd851eb70e1b62114c32
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  3 08:37:16 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Aug  3 08:37:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4275ca54

net-libs/webkit-gtk: roll ~ppc64 keyword forward

Add ~ppc64 keyword to 2.20.3 as they have woff2 keyworded now.
Remove ~ppc64 keyword from 2.18.6 as it's security vulnerable.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 7d945826be7..52bf62e9d38 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~ppc ~ppc64 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~ppc ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index fa06898ad58..264307b6bd2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     a97b0a6a4c55363dcf7094bec60a24532d2e15ad
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 11:10:36 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 11:14:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97b0a6a

net-libs/webkit-gtk: security bump to 2.20.4

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild | 271 +++++++++++++++++++++++++++
 2 files changed, 272 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 2e953f14cf6..5938a2ae0ca 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.20.3.tar.xz 16623456 BLAKE2B 3ae9441287f4af04d2d7e2c490b262b5619f1b47962f16e34589f81f24dfd6b2e4dd3b6c98ce8fc2582c288a5afa492613a36273853cee5bf58946355febb07e SHA512 69a7b27e294de6fd43240ce1d314cd1ccdbf29674c97967674459fd02720b31fa53e5412efbd93dc1e805d38e38feb7fe9a12cdd9c472471676b8db3c11734de
+DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
new file mode 100644
index 00000000000..3990e2853a9
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     ff03ab7b946bfaac2220aaf7d6298417665cbb06
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  6 22:20:25 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 22:20:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff03ab7b

net-libs/webkit-gtk: x86 stable (bug #662974)

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
index 3990e2853a9..0bc0f64c238 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     563c21534c622178dbf440edb18623c63237eb94
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 12:22:36 2018 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 12:22:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=563c2153

net-libs/webkit-gtk: amd64 stable wrt bug #662974

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"

 net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
index 0bc0f64c238..6a241552a2b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     da7e03d47482151b3c023fed22285c956f69c77c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 19:21:04 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 23:01:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7e03d4

net-libs/webkit-gtk: security cleanup

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild | 272 ---------------------------
 2 files changed, 273 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5938a2ae0ca..1bbc78e3db7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
-DIST webkitgtk-2.20.3.tar.xz 16623456 BLAKE2B 3ae9441287f4af04d2d7e2c490b262b5619f1b47962f16e34589f81f24dfd6b2e4dd3b6c98ce8fc2582c288a5afa492613a36273853cee5bf58946355febb07e SHA512 69a7b27e294de6fd43240ce1d314cd1ccdbf29674c97967674459fd02720b31fa53e5412efbd93dc1e805d38e38feb7fe9a12cdd9c472471676b8db3c11734de
 DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
deleted file mode 100644
index 264307b6bd2..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PV}-jsc-build-fixes.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     5fd78130d4bd00e7a02ea5b993a7a6667b78cafd
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 12 18:44:49 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Aug 12 18:44:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd78130

net-libs/webkit-gtk: roll ~ppc keyword forward

Add ~ppc keyword to 2.20.4 as they have woff2 keyworded now.
Remove ~ppc keyword from 2.18.6 as it's security vulnerable.

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 52bf62e9d38..d994ff81f02 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~ppc ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
index 6a241552a2b..b7b46a2a59f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     1dfc49b2b7a082b88ae432c2294fd153b4da2d82
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 12:39:25 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 12:39:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfc49b2

net-libs/webkit-gtk: roll ~alpha keyword forward

Add ~alpha keyword to 2.20.5 as they have woff2 keyworded now.
Remove ~alpha keyword from 2.18.6 as it's security vulnerable.

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index d994ff81f02..6695ba99002 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
index 8ff0820edae..ebbb9fe817c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     ed6b4213993e91cac28df70510eede1f4ff9577f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 12:36:14 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 12:36:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6b4213

net-libs/webkit-gtk: bump to 2.20.5 for a rendering regression fix

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild | 271 +++++++++++++++++++++++++++
 2 files changed, 272 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1bbc78e3db7..23ab85c6a44 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
+DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
new file mode 100644
index 00000000000..8ff0820edae
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     5e4453df0bd28506ed7bf75cdcd2855783209956
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 21:13:46 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 21:32:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4453df

net-libs/webkit-gtk: roll ~amd64-fbsd keyword forward for security

Add ~amd64-fbsd keyword to 2.20.5 as they have woff2 keyworded now.
Remove ~amd64-fbsd keyword from 2.18.6 as it's security vulnerable.

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 6695ba99002..42553a11032 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
index ebbb9fe817c..67e35f0c639 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     bb1d2ca7ceb1e944daadd50ead344d1ac9db70d1
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 17:55:58 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 18:31:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1d2ca7

net-libs/webkit-gtk: bump to 2.22.2

Bug: https://bugs.gentoo.org/667892
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild | 272 +++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c83bb09b3e1..1a9c82c642f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
 DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
+DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
new file mode 100644
index 00000000000..57d749ac75c
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.8.3:1.0
+		>=media-libs/gst-plugins-base-1.8.3:1.0
+		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     d6a49a85c186392b888d0a0b5c2abd29aa5f4bc2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 01:41:27 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 01:41:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a49a85

net-libs/webkit-gtk: x86 stable (bug #667892)

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
index 57d749ac75c..bfee28bfafc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     363f126de02214bc7552bb1f7e1b5b607acd6f0b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 07:52:23 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 07:52:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363f126d

net-libs/webkit-gtk: amd64 stable wrt bug #667892

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
index bfee28bfafc..71766f4371b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     397750445dd53fee8002275611b56a3cea397a7e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 12:04:32 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 12:05:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39775044

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/667892
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild | 271 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild | 271 ---------------------------
 3 files changed, 544 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1a9c82c642f..2351bf98487 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1 @@
-DIST webkitgtk-2.20.4.tar.xz 16625400 BLAKE2B e2a07bbf38f059424738c69ecab7a1eee205cede2bbed4dedd0899e3d38c4b0b6b8f4fc52f5af6d65c0a0c8111c6c73d8765e55452a89022c476e90fb2ff8275 SHA512 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
-DIST webkitgtk-2.20.5.tar.xz 16625200 BLAKE2B 1fd803d81df1659fd87a93821413326eb798fe9c21af86deeb92f16b3f8eab14350851db499e79745457b708305d013032769416877660db3d5bc7c6058b13cc SHA512 d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
deleted file mode 100644
index b7b46a2a59f..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.4.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
deleted file mode 100644
index 67e35f0c639..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.5.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     3522d8681e6b3c1f5d0a8d8879e5cbd699ce753d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 25 15:26:22 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Oct 25 15:27:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3522d868

net-libs/webkit-gtk: add gst-plugins-opus dependency for MSE

MSE needs opus, though techically this is optional. Pull it in
with USE=gstreamer always for now, to trigger the opusparse
related blocker in epiphany for now, while not actually depending
on new enough gst-plugins-opus here, as we are ahead in keywords
for webkit due to security.
Later this dep should be removed again (once gst-plugins-opus
with opusparse is stable) or the dep raised to 1.14.4-r1.

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
index 71766f4371b..4b4d6c0314c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
@@ -39,6 +39,7 @@ RESTRICT="test"
 # Dependencies found at Source/cmake/OptionsGTK.cmake
 # Various compile-time optionals for gtk+-3.22.0 - ensure it
 # Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# TODO: Raise gst-plugins-opus dep to 1.14.4-r1 once we can, and eventually drop the blocker from epiphany; or remove the dep when older than -opus-1.14.4-r1 is not available anymore
 RDEPEND="
 	>=x11-libs/cairo-1.10.2:=[X?]
 	>=media-libs/fontconfig-2.8.0:1.0
@@ -69,6 +70,7 @@ RDEPEND="
 	gstreamer? (
 		>=media-libs/gstreamer-1.8.3:1.0
 		>=media-libs/gst-plugins-base-1.8.3:1.0
+		>=media-plugins/gst-plugins-opus-1.8.3:1.0
 		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
 
 	X? (

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     5fdb99434f2f0b64ca23dd516458c78421143872
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 08:31:23 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 09:57:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdb9943

net-libs/webkit-gtk: sec bump to 2.22.4; require GL

* Security bump to 2.22.4 for WSA-2018-0008
* Builds without GL (opengl or gles2) are currently broken, thus
  REQUIRED_USE it.
* Stop requiring gstreamer for introspection - seems to work fine
  without by now.
* GstreamerGL requires EGL, so REQUIRED_USE it by requiring EGL if
  USE="gstreamer opengl" (USE="gstreamer gles2" is already covered
  by gles2 itself also requiring egl).
* Raise gstreamer deps to ensure working MSE, as hopefully we can
  handle the stabilization of newer gst-plugins-opus for this
  security stabilization round.
* Add references to upstream bugs above REQUIRED_USE - we should
  monitor them on bumps to relax the requirements when/if the
  upstream bugs are fixed.

Closes: https://bugs.gentoo.org/671002
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild | 279 +++++++++++++++++++++++++++
 2 files changed, 280 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 2351bf98487..7595a1dad6f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
+DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
new file mode 100644
index 00000000000..3b79a260396
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+# Review on bumps if fixed upstream and adjust accordingly:
+# non-GL builds are broken - https://bugs.webkit.org/show_bug.cgi?id=191997
+# GstreamerGL gets built even with GL disabled (thus requiring opengl or gles2 with gstreamer) - https://bugs.webkit.org/show_bug.cgi?id=191998
+REQUIRED_USE="
+	^^ ( opengl gles2 )
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     0cfe2b01c6f125f48abb5442c735f4989c8324ee
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  6 14:49:00 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jan  6 14:52:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfe2b01

net-libs/webkit-gtk: security bump to 2.22.5

Allow building without opengl again, as the bugs are fixed, but this
is a very bad idea to do, so added a fat warning if done.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild | 285 +++++++++++++++++++++++++++
 2 files changed, 286 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7595a1dad6f..682450d5c3d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
 DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f
+DIST webkitgtk-2.22.5.tar.xz 16774560 BLAKE2B fb022febf72727d59a1ca9490c8de48ade5a07ff3688b6962481608b9e0d27319282c842eb214783021745c1beb893b8842036c62542874e011f2ab60d275f17 SHA512 fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
new file mode 100644
index 00000000000..396d5f0cb9a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     913691a789e739032138d06fe5f053e5592a1cc7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  9 01:32:32 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jan  9 01:35:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913691a7

net-libs/webkit-gtk: x86 stable (bug #672108)

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
index 396d5f0cb9a..c5f3d0fc3c3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     aeefd0c80593642e5de6378429a9cca2b8a2dfc0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 09:53:28 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 09:53:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeefd0c8

net-libs/webkit-gtk: amd64 stable wrt bug #672108

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
index c5f3d0fc3c3..09e09a0fa79 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     24932e909957a76f1df73e97b157ab61a79cf274
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 19:41:56 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 19:50:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24932e90

net-libs/webkit-gtk: security cleanup

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild | 274 --------------------------
 net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild | 279 ---------------------------
 3 files changed, 555 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 682450d5c3d..0d1f8e478e9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1 @@
-DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
-DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f
 DIST webkitgtk-2.22.5.tar.xz 16774560 BLAKE2B fb022febf72727d59a1ca9490c8de48ade5a07ff3688b6962481608b9e0d27319282c842eb214783021745c1beb893b8842036c62542874e011f2ab60d275f17 SHA512 fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
deleted file mode 100644
index 4b4d6c0314c..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# TODO: Raise gst-plugins-opus dep to 1.14.4-r1 once we can, and eventually drop the blocker from epiphany; or remove the dep when older than -opus-1.14.4-r1 is not available anymore
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.8.3:1.0
-		>=media-libs/gst-plugins-base-1.8.3:1.0
-		>=media-plugins/gst-plugins-opus-1.8.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
deleted file mode 100644
index 3b79a260396..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.4.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-# Review on bumps if fixed upstream and adjust accordingly:
-# non-GL builds are broken - https://bugs.webkit.org/show_bug.cgi?id=191997
-# GstreamerGL gets built even with GL disabled (thus requiring opengl or gles2 with gstreamer) - https://bugs.webkit.org/show_bug.cgi?id=191998
-REQUIRED_USE="
-	^^ ( opengl gles2 )
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     423de9362ed2b23efd5129e22b5bf0e13b2648b8
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 19:33:50 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 19:35:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423de936

net-libs/webkit-gtk: require GL

non-GL builds are only meant for some rare use case needs in the
embedded world. But they are still broken a bit, so just disallow
them for now again. Saves time for those that are for some reason
still trying to disable GL fully.

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

 net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
index 09e09a0fa79..24f6c402a5b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
@@ -21,7 +21,9 @@ IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +intros
 
 # webgl needs gstreamer, bug #560612
 # gstreamer with opengl/gles2 needs egl
+# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
 REQUIRED_USE="
+	^^ ( opengl gles2 )
 	geolocation? ( introspection )
 	gles2? ( egl !opengl )
 	gstreamer? ( opengl? ( egl ) )

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     7fa4d9219d48893aa83138de51eca601fd88fa09
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 07:49:47 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 07:50:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa4d921

net-libs/webkit-gtk: security bump to 2.22.6

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild | 287 +++++++++++++++++++++++++++
 2 files changed, 288 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0d1f8e478e9..01501d651c6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.22.5.tar.xz 16774560 BLAKE2B fb022febf72727d59a1ca9490c8de48ade5a07ff3688b6962481608b9e0d27319282c842eb214783021745c1beb893b8842036c62542874e011f2ab60d275f17 SHA512 fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc
+DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
new file mode 100644
index 00000000000..a75cb189b4f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
+REQUIRED_USE="
+	^^ ( opengl gles2 )
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     823b052210f417458e299d3a2168e3b5b21adc04
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 18:46:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 18:46:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823b0522

net-libs/webkit-gtk: x86 stable (bug #678334)

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
index a75cb189b4f..53f93db7f5a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     967622b7c4602e0dbf15d59bc823c613d505d492
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 20:21:19 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 20:21:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967622b7

net-libs/webkit-gtk: amd64 stable wrt bug #678334

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
index 53f93db7f5a..24f6c402a5b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     e58365e2688ff60fd66aef89de876a18f5b70a38
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 20:47:03 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 20:47:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58365e2

net-libs/webkit-gtk: security cleanup

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild | 287 ---------------------------
 2 files changed, 288 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 01501d651c6..9899d30d68f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.22.5.tar.xz 16774560 BLAKE2B fb022febf72727d59a1ca9490c8de48ade5a07ff3688b6962481608b9e0d27319282c842eb214783021745c1beb893b8842036c62542874e011f2ab60d275f17 SHA512 fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc
 DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
deleted file mode 100644
index 24f6c402a5b..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
-REQUIRED_USE="
-	^^ ( opengl gles2 )
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     2b07d4b2056423f06b3becb0137f5652d4795344
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 08:05:55 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 11:04:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b07d4b2

net-libs/webkit-gtk: bump to 2.22.7

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild | 287 +++++++++++++++++++++++++++
 2 files changed, 288 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9899d30d68f..236813fdaa3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
+DIST webkitgtk-2.22.7.tar.xz 16777676 BLAKE2B 3be5559fce7a07828a7c2a4742218efa5a8434b6e019301b70b969718a3679336b6cb6cf4270bbead814e29c7c19a7c4bf8223df2aa86e1a799364fd9bba393e SHA512 c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
new file mode 100644
index 00000000000..a75cb189b4f
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
+REQUIRED_USE="
+	^^ ( opengl gles2 )
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     9525c2fef49b02e44b867ead43017ea13954dd45
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 20:48:33 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 20:51:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9525c2fe

net-libs/webkit-gtk: bump to 2.24.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/metadata.xml             |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild | 288 +++++++++++++++++++++++++++
 3 files changed, 290 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 236813fdaa3..6b8e6450a8c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
 DIST webkitgtk-2.22.7.tar.xz 16777676 BLAKE2B 3be5559fce7a07828a7c2a4742218efa5a8434b6e019301b70b969718a3679336b6cb6cf4270bbead814e29c7c19a7c4bf8223df2aa86e1a799364fd9bba393e SHA512 c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126
+DIST webkitgtk-2.24.0.tar.xz 17894000 BLAKE2B 55b43ce104c976f73f9fb71a9c395f0636de5547f62f829c098a709b28668b78dab06f90110e387c5c6f33e2c5033cdfafd6adcafb83d03f77b361d315881397 SHA512 7a1444b22fb59ecdd638344acf3525f1ef9204215a568e185f2ac7f4e43cf89c7be307be31d51ec46231bbf5e9470e48d56395873d7368aca8022ff5c4100dab

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 0d69dc72c24..27c7a387561 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -10,6 +10,7 @@
 	<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
new file mode 100644
index 00000000000..e56d04ca4c5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     8b519b169720d73f7fe734f0adbcf41fa68e6b04
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 13:14:35 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 13:15:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b519b16

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 <AT> gentoo.org>

 net-libs/webkit-gtk/metadata.xml             | 1 -
 net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 27c7a387561..0d69dc72c24 100644
--- 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 e56d04ca4c5..21907cebe6e 100644
--- 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)

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     4dba8227f11bb14a765a96f9b55a687fedb11e8e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 19:44:55 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 21:47:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dba8227

net-libs/webkit-gtk: remove redundant double deps

Closes: https://bugs.gentoo.org/680620
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 21907cebe6e..be4ce15cf47 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	>=x11-libs/cairo-1.16.0:=[X?]
 	>=media-libs/fontconfig-2.13.0:1.0
 	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.6.0:0=
+	>=dev-libs/libgcrypt-1.7.0:0=
 	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
 	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
 	>=dev-libs/icu-3.8.1-r1:=
@@ -65,7 +65,6 @@ RDEPEND="
 	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
 	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
 	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
 	spell? ( >=app-text/enchant-0.22:= )
 	gstreamer? (
@@ -99,7 +98,6 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/gperf-3.0.1
@@ -108,7 +106,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 
-	dev-lang/perl
+	>=dev-lang/perl-5.10
 	virtual/perl-Data-Dumper
 	virtual/perl-Carp
 	virtual/perl-JSON-PP

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     6fe28df66d9f60f10ff797d9b67b979fbf5ff57e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 05:47:20 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 08:41:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe28df6

net-libs/webkit-gtk: add support for building with ruby:2.6

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 be4ce15cf47..f77fdc38578 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     08e02e08cb8befcf19ded8e1cee3dd32025bf4bd
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 18:58:50 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 18:59:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e02e08

net-libs/webkit-gtk: security bump to 2.24.1, drop JIT control

JIT manual control is getting complicated for limited benefits, which
mostly involve oneself shooting in the foot. Let upstream build system
figure out whether it should do JIT or not and don't get in the way.
May be revisited based on any fallout and relevant bug reports after
discussions on such reports convince it's needed.

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

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild | 281 +++++++++++++++++++++++++++
 2 files changed, 282 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6b8e6450a8c..8d6471e0bc8 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
 DIST webkitgtk-2.22.7.tar.xz 16777676 BLAKE2B 3be5559fce7a07828a7c2a4742218efa5a8434b6e019301b70b969718a3679336b6cb6cf4270bbead814e29c7c19a7c4bf8223df2aa86e1a799364fd9bba393e SHA512 c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126
 DIST webkitgtk-2.24.0.tar.xz 17894000 BLAKE2B 55b43ce104c976f73f9fb71a9c395f0636de5547f62f829c098a709b28668b78dab06f90110e387c5c6f33e2c5033cdfafd6adcafb83d03f77b361d315881397 SHA512 7a1444b22fb59ecdd638344acf3525f1ef9204215a568e185f2ac7f4e43cf89c7be307be31d51ec46231bbf5e9470e48d56395873d7368aca8022ff5c4100dab
+DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
new file mode 100644
index 00000000000..5c4c67891ba
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Aaron Bauman]

commit:     cd21b3efbd8ca10480cf7b7189c66306f002cf0e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:09:18 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:09:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd21b3ef

net-libs/webkit-gtk: amd64 stable wrt bug #683234

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index 5c4c67891ba..88a7e7a9f99 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     376bfcfd3d25cc3453b4756c21a1fbe203223493
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 21:31:38 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 21:33:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376bfcfd

net-libs/webkit-gtk: x86 stable (bug #683234)

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index 88a7e7a9f99..5e332dec843 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     6b93f98379f931e1d3cc8c547142b7661ee8895c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 08:46:28 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 08:46:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b93f983

net-libs/webkit-gtk: security cleanup

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

 net-libs/webkit-gtk/Manifest                 |   3 -
 net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild | 287 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild | 287 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild | 286 --------------------------
 4 files changed, 863 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8d6471e0bc8..17552826b44 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1 @@
-DIST webkitgtk-2.22.6.tar.xz 16773696 BLAKE2B 06ef81168f2c5c6a10362d7ebe0270c863e7eccc02a6b1f1486a01c3e583295d12f7ba5aa0ccc1ffa36f7e1c884b144ccc4203cf00f3096afa74957bc6875d71 SHA512 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
-DIST webkitgtk-2.22.7.tar.xz 16777676 BLAKE2B 3be5559fce7a07828a7c2a4742218efa5a8434b6e019301b70b969718a3679336b6cb6cf4270bbead814e29c7c19a7c4bf8223df2aa86e1a799364fd9bba393e SHA512 c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126
-DIST webkitgtk-2.24.0.tar.xz 17894000 BLAKE2B 55b43ce104c976f73f9fb71a9c395f0636de5547f62f829c098a709b28668b78dab06f90110e387c5c6f33e2c5033cdfafd6adcafb83d03f77b361d315881397 SHA512 7a1444b22fb59ecdd638344acf3525f1ef9204215a568e185f2ac7f4e43cf89c7be307be31d51ec46231bbf5e9470e48d56395873d7368aca8022ff5c4100dab
 DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
deleted file mode 100644
index 24f6c402a5b..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.6.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
-REQUIRED_USE="
-	^^ ( opengl gles2 )
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
deleted file mode 100644
index a75cb189b4f..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.22.7.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-# non-GL builds are (temporarily?) broken - https://bugs.webkit.org/show_bug.cgi?id=193380
-REQUIRED_USE="
-	^^ ( opengl gles2 )
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=[X?]
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
deleted file mode 100644
index f77fdc38578..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.0.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-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)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     f492a9f52730307bf2010a8ebea9f08e0c7936b7
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 21:47:44 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri May 17 21:48:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f492a9f5

net-libs/webkit-gtk: bump to 2.24.2

Hopefully handles SSE2 missing from CXXFLAGS better.
Unknown what happens for machines that are actually without
SSE2 runtime support.

Closes: https://bugs.gentoo.org/684540
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild | 281 +++++++++++++++++++++++++++
 2 files changed, 282 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 17552826b44..42544431287 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
+DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
new file mode 100644
index 00000000000..5c4c67891ba
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     18adca2cb57f88770f143c826053ea86ac0cd1c9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 13:11:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 19 13:11:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18adca2c

net-libs/webkit-gtk: x86 stable (bug #686216)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
index 5c4c67891ba..5aa74e63559 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     8d4664f638c4a0f2f3545f44851f96c3f37aa65d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 20:01:47 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 19 20:01:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4664f6

net-libs/webkit-gtk: amd64 stable wrt bug #686216

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
index 5aa74e63559..5e332dec843 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Aaron Bauman]

commit:     aba526547e5843d531f160c43a8da149109b7ebd
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 22:40:36 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 21 02:39:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba52654

net-libs/webkit-gtk: arm64 stable

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index 5e332dec843..4438db5fb69 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     38c61836112051a936827d941200cb093f081190
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 06:07:04 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 06:07:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38c61836

net-libs/webkit-gtk: default enable jpeg2k

JPEG 2000 support is important for various image managers on the
web, because they are giving that format with the currently used
User Agent, while they'd give WebP with different user agents.
But using that different UA would break many other things, thus
jpeg2k is pretty much mandatory for good browser usages,
therefore default enable it at least.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
index 5e332dec843..fd02876d160 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.2.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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
 # webgl needs gstreamer, bug #560612
 # gstreamer with opengl/gles2 needs egl

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     dc740ff998148165a8719f54863196a265afe05f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 15:17:20 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 15:17:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc740ff9

net-libs/webkit-gtk: bump to 2.24.3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild | 281 +++++++++++++++++++++++++++
 2 files changed, 282 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 42544431287..3e5cee29392 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
 DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
+DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
new file mode 100644
index 00000000000..5b32156fc10
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Aaron Bauman]

commit:     c1d2e8fc1aca13f0f07fe287ef14bed0dc3bc8a2
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 22:56:29 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 22:56:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d2e8fc

net-libs/webkit-gtk: arm64 stable (bug #692356)

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.71, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
index 5b32156fc10..867d03afc2d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     fd1fb95a2c453387f6e81b4d9a953309d36937fc
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 05:42:26 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 05:42:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1fb95a

net-libs/webkit-gtk: amd64 stable wrt bug #692356

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
index 867d03afc2d..1163fd4176f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     fee64394c9f9529969fbcbf0b409b8e307417261
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 11:37:24 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 11:37:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee64394

net-libs/webkit-gtk: x86 stable wrt bug #692356

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
index 1163fd4176f..c8444e26f61 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     397ca5618acd3a4a54a564e68437e51792e725ee
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 20:06:27 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 20:06:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397ca561

net-libs/webkit-gtk: security bump to 2.24.4

Bug: https://bugs.gentoo.org/693122
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 281 +++++++++++++++++++++++++++
 2 files changed, 282 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index f179b120a41..38c6c23831c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f
+DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
new file mode 100644
index 00000000000..5b32156fc10
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://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 ~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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     e94574b23b0927cbe4403db7b1fcccc5a3455b98
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 07:25:28 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 20:06:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94574b2

net-libs/webkit-gtk: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild | 281 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild | 281 ---------------------------
 3 files changed, 564 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3e5cee29392..f179b120a41 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1 @@
-DIST webkitgtk-2.24.1.tar.xz 17897488 BLAKE2B 62cd6d896d4b4847430f0d41de92595e955db283626dad2aa560071da12ccd0c24093163e15cc50c30ceb96f9767797f9051657ec68f822e7e371c8566872ad5 SHA512 65424f03b6baca53d64f0d633f53e2f7788c7fb65aa8b50b696418c140707c40351ec3cc0a8652806d75b9da98a04a8bb4203dd6ee4c51a3f93878964354c1ca
-DIST webkitgtk-2.24.2.tar.xz 17908808 BLAKE2B bf53f27a5fa15067fb91cbfcff3c2287418c797a4ad03d3a71fbdb194c27e069ab5985b9c8e8df008ed80c80fe2a397d71297b4c187fd7c3acbfe2961d332c50 SHA512 8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa
 DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
deleted file mode 100644
index 4438db5fb69..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 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 jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
deleted file mode 100644
index fd02876d160..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.2.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 ~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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Aaron Bauman]

commit:     f0ecee9c3835a9027712602d2303754c2d846fd3
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:16:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 21:25:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ecee9c

net-libs/webkit-gtk: arm64 stable (bug #693122)

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.74, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 5b32156fc10..867d03afc2d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     c5656c9dd7eec8fdaf3460b8d3594597d92e16a0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 10:14:54 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 10:14:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5656c9d

net-libs/webkit-gtk: x86 stable wrt bug #693122

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 867d03afc2d..e57e041d64a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     a03edf01aa269c75b13af1d6fc912d017226cd54
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 13:23:29 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 13:23:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03edf01

net-libs/webkit-gtk: amd64 stable wrt bug #693122

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index e57e041d64a..c8444e26f61 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://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 arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     fd95ecc7338b510f8beb3c559c630721885e75e7
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 14:09:01 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 14:09:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd95ecc7

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/693122
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild | 281 ---------------------------
 2 files changed, 282 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 38c6c23831c..99e63863298 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.24.3.tar.xz 17912032 BLAKE2B 9ac897f10ef25a25b70b73499fb79b72d469c0016231b94fb3376dc8876fd9ac2874bac38450ddf67c80dba8a66fa509c8cd42bc4ce5316d6e4a17fa1346803c SHA512 b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
deleted file mode 100644
index c8444e26f61..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.3.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://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 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 +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
-
-# webgl needs gstreamer, bug #560612
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	nsplugin? ( X )
-	webgl? ( gstreamer
-		|| ( gles2 opengl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-
-	if ! use opengl && ! use gles2; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		#-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     4ab42af0fa873f3df96d1171db84d76d52a1e524
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 20:59:05 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 21:22:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab42af0

net-libs/webkit-gtk: add upstream bug reference to glvnd patch

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 93381a7d5a1..6b71ee4d01d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -160,7 +160,7 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596
-	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054
+	eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
 	cmake-utils_src_prepare
 	gnome2_src_prepare
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     9b30217d8f3fab212eb6635b85c2ae7e29e93c47
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 14:01:12 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 14:01:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b30217d

net-libs/webkit-gtk: adjust compiler deps and checks

The gcc < 7.3 check will work wrong once gcc10 comes along.
Adjust the clang dep to match when initial C++17 support came along.

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index 5c3c199bdba..5716514c3df 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -114,7 +114,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.10
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-3.3 )
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
 	sys-devel/gettext
 	virtual/pkgconfig
 
@@ -148,10 +148,6 @@ pkg_pretend() {
 		if ! test-flag-CXX -std=c++17 ; then
 			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
 		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 7.3 ]] ; then
-			die 'The active compiler needs to be gcc 7.3 (or newer)'
-		fi
 	fi
 
 	if ! use opengl && ! use gles2-only; then

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     8310c54b5900219acd6f7833263caba85931469d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 15:18:42 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 15:18:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8310c54b

net-libs/webkit-gtk: amd64 stable wrt bug #699156

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index 5716514c3df..9cc790ed99f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     3ba0cdea3eae7b69ade6cdc94066754d562e5785
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 22:39:45 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 22:48:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba0cdea

net-libs/webkit-gtk: Unconditionally build WebGL with enabled OpenGL

Building with ENABLE_GL but without WEBGL is unsupported upstream and has
no real benefits. The WebGL support can be disabled at runtime, if
desired. Therefore tie the choice of WebGL support to having enabled
GL support (full opengl or gles2), matching what upstream does if an
explicit ENABLE_WEBGL _private_ configuration value isn't given. We keep
it as a separately passed arg for now just for the sake of being explicit.

WebGL has been fine without gstreamer for a while now - that seems to
have been a temporary bug in the ancient 2.10 series - so all this does
not mean that gstreamer is required with GL and the REQUIRED_USE that
was there is dropped (not only due to IUSE=webgl going away - had it
stayed, the restriction was wrong with USE=webgl being there too).
It should also be fine without libXcomposite and libXdamage on wayland-only
builds, so those deps are simply dropped (they are still there for USE=X).
This may have been a reason some may have wanted to disable WebGL for
wayland-only builds, but it was probably legacy wrong deps.

Update a comment about WebRTC (upstream is using libwebrtc instead of
OpenWebRTC right now, but isn't a supported build option out of tarballs,
plus it may end up using gstreamer instead before it becomes non-experimental).
Also remove outdated comment about FTL_JIT (it doesn't need llvm anymore and
we are letting it be handled automatically by upstream cmake per-architecture
conditionals).

Drop -fno-strict-aliasing build flags forcing - upstream build system is
supposed to take care of it these days. As I confirmed I still get it in the
compiler calls, this change does not necessitate a revbump either (the rest
are --changed-use territory).

Closes: https://bugs.gentoo.org/704538
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index b743a3359c9..24b67060587 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -18,15 +18,12 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="amd64"
 
-IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +webgl +X"
+IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 
-# webgl needs gstreamer, bug #560612
 # gstreamer with opengl/gles2 needs egl
 REQUIRED_USE="
 	gles2-only? ( egl !opengl )
 	gstreamer? ( opengl? ( egl ) )
-	webgl? ( gstreamer
-		|| ( gles2-only opengl ) )
 	wayland? ( egl )
 	|| ( aqua wayland X )
 "
@@ -38,7 +35,7 @@ RESTRICT="test"
 # Aqua support in gtk3 is untested
 # Dependencies found at Source/cmake/OptionsGTK.cmake
 # Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
 # >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
 wpe_depend="
 	>=gui-libs/libwpe-1.3.0:1.0
@@ -93,9 +90,6 @@ RDEPEND="
 		opengl? ( ${wpe_depend} )
 		gles2-only? ( ${wpe_depend} )
 	)
-	webgl? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
 
 	seccomp? (
 		>=sys-apps/bubblewrap-0.3.1
@@ -205,9 +199,6 @@ src_configure() {
 #		append-ldflags "-Wl,--reduce-memory-overheads"
 #	fi
 
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
@@ -223,8 +214,6 @@ src_configure() {
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
 	#
-	# FTL_JIT requires llvm
-	#
 	# opengl needs to be explicetly handled, bug #576634
 
 	local use_wpe_renderer=OFF
@@ -254,11 +243,11 @@ src_configure() {
 		-DENABLE_SPELLCHECK=$(usex spell)
 		-DENABLE_WAYLAND_TARGET=$(usex wayland)
 		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		-DENABLE_WEBGL=$(usex webgl)
 		$(cmake-utils_use_find_package egl EGL)
 		$(cmake-utils_use_find_package opengl OpenGL)
 		-DENABLE_X11_TARGET=$(usex X)
 		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
 		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
 		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
 		-DCMAKE_BUILD_TYPE=Release

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     e9b2335b9e4926b133e6e77f182c050629f2f47b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 00:56:41 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 00:56:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b2335b

net-libs/webkit-gtk: x86 stable (bug #699156)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index 9e15546d973..d6f70cb140c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 
 IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sergei Trofimovich]

commit:     b394b149fe25867fc605f9298afb961ced47077f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 22:40:03 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:40:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b394b149

net-libs/webkit-gtk: keyworded 2.26.2 for ia64, bug #704182

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index d6f70cb140c..213cc6ae97c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 
 IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sergei Trofimovich]

commit:     37ae79bebefbf05ea9e62ef65a91e1939890fa5a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 22:46:22 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 22:46:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ae79be

net-libs/webkit-gtk: keyworded 2.26.2 for ppc64, bug #704182

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index 213cc6ae97c..b2ae6bf0f10 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
 
 IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     54d685adca7f9fcd7ae071e767089a3f8c8f4f68
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 10:08:43 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 18:16:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d685ad

net-libs/webkit-gtk: fix ruby check for cross-compilation

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index b2ae6bf0f10..d8e82634b06 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -203,7 +203,7 @@ src_configure() {
 	local rubyimpl
 	local ruby_interpreter=""
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
 			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
 		fi
 	done

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sergei Trofimovich]

commit:     ebfd85983d164d2ddb840d9ad806216492f2992f
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Jan 25 17:18:44 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 17:36:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebfd8598

net-libs/webkit-gtk: keyworded 2.26.2 for sparc, bug #704182

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index 455b181a4dd..8e5adac62ed 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage doc +egl +geolocation gles2-only gnome-keyring +gstreamer +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Piotr Karbowski]

commit:     b959e5cf65a4dbb7444db618c8b4e3c2b9de948f
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 09:33:11 2020 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 09:33:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b959e5cf

net-libs/webkit-gtk-2.26.3: amd64 stable (bug 706374)

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
index 0a63fc77b7a..dc54bb7d318 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     ff20f07b8a15aa25f22ad73cc706bda6e7c04854
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  3 14:44:48 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 14:44:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff20f07b

net-libs/webkit-gtk: x86 stable wrt bug #706374

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
index dc54bb7d318..d3c8a17109f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     4a8a4748e25808d08d3737dbb7d271d4adba827e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 12:37:23 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 13:06:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8a4748

net-libs/webkit-gtk: ensure enchant:2 gets used

We need a revision that ensures enchant:2 gets used, so that other packages
can also ensure all components use enchant:2 (e.g. geary pulls in enchant
itself, via gspell and via webkit-gtk), so they don't mix them all into the
same process space, ending up with the potential for mystery issues due to
symbol mixing.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild | 287 ++++++++++++++++++++++++
 1 file changed, 287 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
new file mode 100644
index 00000000000..bc2267a80b9
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.3.0:1.0
+	>=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+	eapply "${FILESDIR}"/${PV}-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+	eapply "${FILESDIR}"/${PV}-fix-noGL-wayland-build.patch
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake-utils_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     fb2dcb0fecee802258e1501ef657f6de2a4c99a0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 22:14:37 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 14 22:14:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2dcb0f

net-libs/webkit-gtk: security bump to 2.26.4

-r0 is for fast security stabling, -r1 is the enchant:2 ensuring
revision.

Bug: https://bugs.gentoo.org/709612
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                    |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 286 ++++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild    | 286 ++++++++++++++++++++++++
 3 files changed, 573 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d7bccd3000a..963bb2a94ad 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9
+DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
new file mode 100644
index 00000000000..98448644402
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.3.0:1.0
+	>=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake-utils_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
new file mode 100644
index 00000000000..4a639c00493
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.3.0:1.0
+	>=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
+	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake-utils_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mikle Kolyada]

commit:     74f0b97c446964d87faeb59e844272c0fa0988e0
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 12:20:42 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 12:20:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f0b97c

net-libs/webkit-gtk: amd64 stable wrt bug #709612

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index 4a639c00493..20326397a0d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     4c50abcdbb918c3af9934163878db740b901e6e9
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 21:09:01 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 21:13:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c50abcd

net-libs/webkit-gtk: x86 stable (bug #709612)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index 20326397a0d..3fc54945cce 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     d62b65d71bc99eba63b288e1b035dc3099acb723
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 17:41:56 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 17:43:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62b65d7

net-libs/webkit-gtk: arm64 keyworded (bug #704182)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index 98448644402..83663f86017 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index 3fc54945cce..aaa55b7f766 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     21a0e1eddea8f443fd4822a75d730f5c4f84cf14
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 20:04:39 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 20:04:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a0e1ed

net-libs/webkit-gtk: arm64 stable (bug #709612)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
index aaa55b7f766..48c9e084906 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     35abfda017fa69012bb8f7c768ed24d9b343c281
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 20:08:03 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 20:08:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35abfda0

net-libs/webkit-gtk: security cleanup to the extent possible

Vulnerable versions only in ~arch versions now due to lack of
movement on many architectures on re-keywording

Bug: https://bugs.gentoo.org/709612
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 47f5da095e9..430f780b0e2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~arm arm64 ~ppc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Andreas Sturmlechner]

commit:     d76c594ef82e4e263911f885f25cc91feb32f0fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 21:23:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 14:56:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d76c594e

net-libs/webkit-gtk: Fix gles2-only MatchingGlobalUse

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/webkit-gtk/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index e88c10a5699..27c7a387561 100644
--- 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="gles2-only">Use GLES 2.0 or later instead of full OpenGL</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>

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     3619cb2efe155b326197efd3a5a06b2018bf9af3
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 21:49:13 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 21:52:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3619cb2e

net-libs/webkit-gtk: arm64 stable (bug #717076)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index 2841ecb62b6..efecc165c65 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     911fb24a0659471867133482423cdc91cc42f9e5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 14:48:03 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 14:48:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911fb24a

net-libs/webkit-gtk: amd64 stable wrt bug #717076

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index efecc165c65..d0524be74df 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     fa16bcc34f9efd4762bb53cbb173393652663317
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 16:12:03 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 16:12:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa16bcc3

net-libs/webkit-gtk: x86 stable wrt bug #717076

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
index d0524be74df..b9b0a863fea 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     ff35ce56d480f761ed4a021bf721bafd49b21019
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 06:28:57 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 08:05:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff35ce56

net-libs/webkit-gtk: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild | 286 ---------------------------
 1 file changed, 286 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
deleted file mode 100644
index 1e118e26cff..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     12baa067e54352895cd2bcc74d954f7d5491ff80
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 07:15:40 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 08:05:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12baa067

net-libs/webkit-gtk: bump to 2.28.1

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild | 287 +++++++++++++++++++++++++++
 2 files changed, 288 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index cc4924be113..ba34c035271 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
+DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
new file mode 100644
index 00000000000..c620765c08c
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python{3_6,3_7} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+CMAKE_MIN_VERSION=3.10
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.3.0:1.0
+	>=gui-libs/wpebackend-fdo-1.3.1:1.0
+"
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+"
+unset wpe_depend
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake-utils_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     d8d12ba5cc21c7772fd162db8d1a82548b101d9a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 12:07:40 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 12:07:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d12ba5

net-libs/webkit-gtk: fix typo in ewarn

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
index c620765c08c..4780125bbb3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
@@ -147,7 +147,7 @@ pkg_pretend() {
 
 	if ! use opengl && ! use gles2-only; then
 		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely."
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
 		ewarn "This is an unsupported configuration meant for very specific embedded"
 		ewarn "use cases, where there truly is no GL possible (and even that use case"
 		ewarn "is very unlikely to come by). If you have GL (even software-only), you"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     97e098e115caed2df64a7f114de0893da406ce07
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 08:10:43 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun May 10 08:10:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e098e1

net-libs/webkit-gtk: add a low prio TODO note about GLX vs Gst

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index 2d5533bf953..506b161ddf4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -41,6 +41,7 @@ wpe_depend="
 	>=gui-libs/libwpe-1.3.0:1.0
 	>=gui-libs/wpebackend-fdo-1.3.1:1.0
 "
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
 RDEPEND="
 	>=x11-libs/cairo-1.16.0:=[X?]
 	>=media-libs/fontconfig-2.13.0:1.0

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     960738f67cb23484f4d6ed1dbb7c46672a8ae7c7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 13:17:51 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 13 13:17:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960738f6

net-libs/webkit-gtk: amd64 stable wrt bug #712260

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index ec2540acbd1..f4a22f4410f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     7185defa32fb2721281ca22fb9633fc61e682e07
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 13:19:34 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 13 13:19:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7185defa

net-libs/webkit-gtk: x86 stable wrt bug #712260

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index f4a22f4410f..20fa81b568f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     7ad9f6442cf5702ef49f20d3f8328181cc2d757f
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Thu May 14 13:17:13 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu May 14 21:25:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad9f644

net-libs/webkit-gtk: arm64 stable (bug #712260)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index 20fa81b568f..bfb9e1492a6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     4554293fde11b2810361313a45a752d4700bb326
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 12:36:09 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri May 15 12:36:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4554293f

net-libs/webkit-gtk: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild | 287 ---------------------------
 2 files changed, 288 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ec39ddf8a52..9cb9e91b4fc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,3 @@
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474
-DIST webkitgtk-2.28.1.tar.xz 21427628 BLAKE2B 58f19d68598ed1aee58f9f700c84e76c9c58980e39d7fe1883c3be991f575074db3156b9a7a041bb3d59130d87d37b1bdee9cf6c122c4f0b0ba6637d66534c32 SHA512 30cfe63d202673d1f0b0ab32e062eab225e51b993d9bb0f51c02d0497423e1591b5a2e943c30d1c9ee6d9073dfbd13b8ec24bca94f380fe8886019e8185628b8
 DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
deleted file mode 100644
index 4780125bbb3..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
-
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michał Górny]

commit:     31d828028067cd817b1cb772883a8054864cbdd3
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Sat May 30 15:17:20 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 20:30:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d82802

net-libs/webkit-gtk: arm keyworded (bug #704182)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
index bfb9e1492a6..d8c2b014eb3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     61aa7deef9524d18d29acf672681160a52cebd5f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 00:19:15 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 00:19:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61aa7dee

net-libs/webkit-gtk: arm64 stable (bug #732104)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
index 407812b79e1..e4395011134 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     e737e98ba2cb25c57e609a185c90e8e185656610
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 11:40:14 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 11:42:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e737e98b

net-libs/webkit-gtk: x86 stable (bug #732104)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
index 743287f638e..fb4f89d11f4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     7ef83b31f3b134855d0e8ab81bf1d838015b5f58
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 11:39:19 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 11:42:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef83b31

net-libs/webkit-gtk: amd64 stable (bug #732104)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
index e4395011134..743287f638e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     05fd55aaf8c5cb0c7f279cd655000f103d44630e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 23:05:27 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 23:05:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05fd55aa

net-libs/webkit-gtk: arm64 stable (bug #734584)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
index be64db08026..2778cfc74d4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     98011df3c243bd99d80fe4b372eed2bb3f9f258d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 23:08:16 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 23:08:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98011df3

net-libs/webkit-gtk: amd64 stable (bug #734584)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
index 2778cfc74d4..5fa58cca428 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     88bc3775405af6b43ddf58ae29f13213d2598bbe
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 23:47:05 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 23:47:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88bc3775

net-libs/webkit-gtk: x86 stable (bug #734584)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
index 5fa58cca428..27ed996c0ab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     f85d181d73c396cb186f4cb1e81499e8ee5d05db
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 19:23:19 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 22:03:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85d181d

net-libs/webkit-gtk: allow python3.8 for build

Bug: https://bugs.gentoo.org/737706
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
index 27ed996c0ab..1a0c147ba35 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..8} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     185f1c4a2daa0a7304df734ad093afa1a6c5ddcb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 17:25:34 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 17:25:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185f1c4a

net-libs/webkit-gtk: Stabilize 2.30.3 amd64, #755947

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
index 42baa21fdab..00585f4d835 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     2c7e812c5324bcd6c0064d65b95ed75b8c8cfdc7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 17:27:05 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 17:27:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c7e812c

net-libs/webkit-gtk: Stabilize 2.30.3 arm64, #755947

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
index 00585f4d835..b1951231dbb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     22dd8cc0f1e79d9f6b5d894e7c09a358f71c91f7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 18:23:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 18:23:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22dd8cc0

net-libs/webkit-gtk: x86 stable (bug #755947)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
index b1951231dbb..9472a0f8c26 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     52a65460e664cb123bd3d81af26473d0b6e4a20b
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 11:52:10 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 11:52:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a65460

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/755947
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild | 290 ---------------------------
 2 files changed, 291 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ab2f785dfb5..5e05ea7fde1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.28.4.tar.xz 21424908 BLAKE2B 5ca9206c3c7d0a00bc76487ae8fe79e6c5b94a86f23300f196b3edbd5e3f1ea68768ef4465b32fa694a7b6a4a2b274dfb9dba4a20b8329f9138970f1a82eb7e6 SHA512 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
deleted file mode 100644
index 1a0c147ba35..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python3_{6..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-CMAKE_MIN_VERSION=3.10
-
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
-
-IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.3.0:1.0
-	>=gui-libs/wpebackend-fdo-1.3.1:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-"
-unset wpe_depend
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake-utils_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	WK_USE_CCACHE=NO cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     3b25163ee3cab51e30511205ced609211cef9f02
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 16:03:14 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 16:03:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b25163e

net-libs/webkit-gtk: bump to 2.30.4

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild | 296 +++++++++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5e05ea7fde1..9957c880314 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
+DIST webkitgtk-2.30.4.tar.xz 22310784 BLAKE2B 648f03c929212b57f3197b0540e002dca5b277c44e9e73612b20ac1861747585aeb835ce25e98d5073d67a5ab5fc7c13985d280e6e658ac22619233db911ae97 SHA512 dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
new file mode 100644
index 00000000000..ed189da55d7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     0f261968c53e914d3e339e57c7d157b72bf32f81
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 15:54:17 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 16:03:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f261968

net-libs/webkit-gtk-2.30.4: workaround evolution bug, other improvements

* Porting from cmake-utils.eclass to cmake.eclass made -DNDEBUG not be passed
  anymore, converting some mail-client/evolution issues into aborts. Keep
  passing -DNDEBUG for the time being again.
* Improve cross-compilation by not requiring sys-apps/xdg-dbus-proxy on CBUILD
* Build the MiniBrowser with USE=examples

Bug: https://bugs.gentoo.org/761238
Closes: https://bugs.gentoo.org/760902
Closes: https://bugs.gentoo.org/758299
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/metadata.xml                |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild | 300 ++++++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 3e6a3fc0ecd..ab36b128219 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="egl">Enable EGL support</flag>
+	<flag name="examples">Install the MiniBrowser example application</flag>
 	<flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="jumbo-build">Combine source files to speed up build process</flag>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
new file mode 100644
index 00000000000..b360de50319
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     590b633ad50bdb370b5819b65e56e3d83ea65f49
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 17:21:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 17:21:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590b633a

net-libs/webkit-gtk: Stabilize 2.30.4-r1 ppc64, #769374

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
index 42718dfa7a0..de3f01f764c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[James Le Cuirot]

commit:     d74b1a1842f548e1a5458b8a4dfbe25401ac77ed
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 22:38:49 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 22:39:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74b1a18

net-libs/webkit-gtk: Add ruby30 to USE_RUBY

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
index de3f01f764c..fd233c5c86f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
 
 inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     38245248b5822f7603a743a7cadeda7a9a5f52ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 00:06:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 00:06:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38245248

net-libs/webkit-gtk: Stabilize 2.30.4-r1 arm, #769374

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
index fd233c5c86f..688b7347976 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     fbec848dd4cee78c72e9702952e82229d0a0440c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 22:44:40 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 22:44:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbec848d

net-libs/webkit-gtk: security bump to 2.30.5

Bug: https://bugs.gentoo.org/770793
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 300 +++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9957c880314..e4f447dbf79 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.30.3.tar.xz 22311704 BLAKE2B d5a8ba1fe7fbbcd3d8504ad98650ec685a41ddaa43e1392172cf7840100157a283e4ccf4cf62f2f581deffd8d860cf61b43fe59178b02306efb88c8e1a803520 SHA512 cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
 DIST webkitgtk-2.30.4.tar.xz 22310784 BLAKE2B 648f03c929212b57f3197b0540e002dca5b277c44e9e73612b20ac1861747585aeb835ce25e98d5073d67a5ab5fc7c13985d280e6e658ac22619233db911ae97 SHA512 dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
+DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
new file mode 100644
index 00000000000..2d1a8c84172
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     cfd0180f76c71503fe4fd48b45681de6288429f6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 01:17:17 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 01:17:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd0180f

net-libs/webkit-gtk: x86 stable (bug #770793)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
index 2d1a8c84172..d7f8b4a66b1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     9f2aea513b8eca5c08cc170b05058ca1e91026ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 03:00:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 03:00:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2aea51

net-libs/webkit-gtk: Stabilize 2.30.5 ppc64, #770793

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
index d7f8b4a66b1..8be69bf5041 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     81096ec87e503463bcca9a885941488dfd27ccc2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 12:00:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 12:00:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81096ec8

net-libs/webkit-gtk: Stabilize 2.30.5 arm64, #770793

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
index 8be69bf5041..0bba779bf89 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     4e4626de7a63c57e8132d7d34836973e071db6f4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 16:16:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 16:16:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4626de

net-libs/webkit-gtk: Stabilize 2.30.5 arm, #770793

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
index 0bba779bf89..7e89be8f928 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~sparc x86"
+KEYWORDS="~amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     982c99dce113daef8367b8fb6c3c2fd2dc009853
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 01:25:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 01:25:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982c99dc

net-libs/webkit-gtk: Stabilize 2.30.5 amd64, #770793

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
index 7e89be8f928..b62e32197a1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     f5e8511b02c9fb2006d34ce299af13f2069ca8d7
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 10:17:18 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 10:17:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e8511b

net-libs/webkit-gtk: security bump to 2.30.6

Bug: https://bugs.gentoo.org/773193
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 300 +++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 58a92b6a176..60758d753b3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d
+DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05 SHA512 fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
new file mode 100644
index 00000000000..2d1a8c84172
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
+	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     4c84a167d243be4d41ababcde1aa9cd0530fe7d4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:13:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:13:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c84a167

net-libs/webkit-gtk: Stabilize 2.30.6 arm64, #773193

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index 2d1a8c84172..9a50f10e3af 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     282c980a7afd644b02d8158955697e481d535ceb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 06:19:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 06:19:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=282c980a

net-libs/webkit-gtk: Stabilize 2.30.6 amd64, #773193

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index 9a50f10e3af..bc90d9081a6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     babd9715724696f34bca52bea1bfe4dee76920c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 09:27:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 09:31:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=babd9715

net-libs/webkit-gtk: Stabilize 2.30.6 arm, #773193

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index bc90d9081a6..fbef33325fd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     fe31b6ca73b3c89b1c44c9077897bd11d7dea304
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 17:40:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 17:41:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe31b6ca

net-libs/webkit-gtk: Stabilize 2.30.6 x86, #773193

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index fbef33325fd..fae472e8685 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     cbe24b442a42d221dd1b7ef6b2daa7c48018271f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 26 19:17:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 26 19:18:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe24b44

net-libs/webkit-gtk: Stabilize 2.30.6 ppc64, #773193

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index fae472e8685..b62e32197a1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     01a081aec3edf82de44eefada66e859c98d34498
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 01:26:18 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 01:26:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a081ae

net-libs/webkit-gtk: Add Python 3.9 support

Closes: https://bugs.gentoo.org/737706
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index b62e32197a1..5c70c3a07d2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
 
 inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Thomas Deutschmann]

commit:     7a8d3a6ed37d6d4870c91ba9691286e671092089
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 22:05:44 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 22:06:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8d3a6e

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/773193
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild | 300 ---------------------------
 2 files changed, 301 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 60758d753b3..47c55e0ecf0 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.30.5.tar.xz 22311832 BLAKE2B b00e889d59883e62bcf179df8a766e20a7cd7ee2db462c4eb4279686aac5ea1cad7903189b14031088ab23b8dfd89c1f09f90e2deb5d208281d55c262cc0cb3c SHA512 406fc767a806bb2af446c73e7079720a4d82d592a95a20f30f468c31cdc2efd25e082a5ecfbe00c27f62236e1e56a729c48191451d130188419967975378235d
 DIST webkitgtk-2.30.6.tar.xz 22311524 BLAKE2B 369a2f03b99a17b3e7ffbd0a8528a0d7f65334138552e7684fdec6b3003fab8d9a946f1b549849562b71e9a0daa3f870578d088833db2e8e291974bd38eaed05 SHA512 fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
deleted file mode 100644
index b62e32197a1..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.5.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
-USE_RUBY="ruby24 ruby25 ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.24.4-eglmesaext-include.patch # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/2.28.2-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.28.4-non-jumbo-fix2.patch
-	eapply "${FILESDIR}"/2.30.3-fix-noGL-build.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_GRAPHICS_CONTEXT_GL=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     f25e9fd33787c36e40648146fce6db934a7e8cea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 19:10:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 19:10:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25e9fd3

net-libs/webkit-gtk: Stabilize 2.32.1 arm, #792327

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
index eb00847845d..0c70cf43cd1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     afeb5eef60b9af1f32e291b49c061fab69e0d64a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 15:26:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 29 15:26:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeb5eef

net-libs/webkit-gtk: Stabilize 2.32.1 ppc64, #792327

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
index d7768a9c2c7..9594f2f217a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     63ff9992d1901baf5a3bb65c01f1885381522a48
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 00:45:36 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 01:10:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ff9992

net-libs/webkit-gtk: Version bump to 2.32.2

Closes: https://bugs.gentoo.org/801400
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild | 300 +++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 391d1ff5b4f..70f486727e0 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
+DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b7b6e11219134dbefb774349b7752f5b498a168594addcb5d6f0d8a7977d3b946fd546583789d6c74cd8d7faf3823f1 SHA512 ca131fef749e5d882cebcf71b4f865511a43fb60b41c917a8a98876dde108a71888e986e40217ff12a43fb395c147e7b6c7a262bc353269498f1dba33e3905f8

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild
new file mode 100644
index 00000000000..b9fb5aa5f70
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.2.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     493ca60267f9cea93c5d69b38976871547635232
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 17:43:13 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 17:49:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493ca602

net-libs/webkit-gtk: Version bump to 2.32.3

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 300 +++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 70f486727e0..62f93f0ed79 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.32.1.tar.xz 23321600 BLAKE2B a2d0b1cfd1035611427ab23f4723b8ab4c3087b21f3b14716a0bc9b128eba8c74c36dec34709bfc40efa1961416e7b83dceb8c53c1959ce34babb7b5335a5863 SHA512 ff49522c585d3c5c9b88c4176673aebfdf7f2a127d7bc4007008a66c493476ae6551189865e4f0f330a7b332a438b6c951bf1a4c21cd0acf69b7051903d24843
 DIST webkitgtk-2.32.2.tar.xz 23321888 BLAKE2B 1201ca423b90a7ba9e7613407e170d367b7b6e11219134dbefb774349b7752f5b498a168594addcb5d6f0d8a7977d3b946fd546583789d6c74cd8d7faf3823f1 SHA512 ca131fef749e5d882cebcf71b4f865511a43fb60b41c917a8a98876dde108a71888e986e40217ff12a43fb395c147e7b6c7a262bc353269498f1dba33e3905f8
+DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
new file mode 100644
index 00000000000..b9fb5aa5f70
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     7daf8c2e3d8b6b862aed99297cc47afb2fc253f4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 06:40:52 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 06:40:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7daf8c2e

net-libs/webkit-gtk: amd64 stable wrt bug #801400

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index b9fb5aa5f70..9e5a05f3776 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     d5556b855779638654d5b73249714a31d6b19989
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 16:43:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 16:43:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5556b85

net-libs/webkit-gtk: Stabilize 2.32.3 arm64, #801400

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 9e5a05f3776..576f1229c86 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     5f7f18fc2423e4b3d3d57ac4b2e93aae9d2b6741
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 15:16:26 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 15:16:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7f18fc

net-libs/webkit-gtk: ppc64 stable wrt bug #801400

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 576f1229c86..50391acb33b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     78b673931e384bd6c9b12f5797e792ea0dd7634c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 22:34:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 22:34:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b67393

net-libs/webkit-gtk: Stabilize 2.32.3 x86, #801400

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 50391acb33b..082b9cc4385 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     9f6d897e94ddc7d69639eec34b2414d271a9ac53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 30 22:34:43 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 30 22:34:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6d897e

net-libs/webkit-gtk: Stabilize 2.32.3 arm, #801400

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 082b9cc4385..d141e1d49cb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     d39488fa296b3926c43922f67762e2fcaf8e3fde
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 01:37:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 01:37:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d39488fa

net-libs/webkit-gtk: Keyword 2.32.3 ppc, #775791

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index d141e1d49cb..1ddc63054d3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     ed9927adff78c7facdd9e832a1ca1bb14524fb4d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 01:41:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 01:41:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9927ad

Revert "net-libs/webkit-gtk: Keyword 2.32.3 ppc, #775791"

This reverts commit d39488fa296b3926c43922f67762e2fcaf8e3fde.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index 1ddc63054d3..d141e1d49cb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     717904910339b0a5390a5ac7918b506732152136
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  2 00:43:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  2 00:43:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71790491

net-libs/webkit-gtk: Keyword 2.32.3 ppc, #775791

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
index d141e1d49cb..1ddc63054d3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     abde07959df441fb48875abfb78b8277efe2d31f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 14:12:24 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 15:23:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abde0795

net-libs/webkit-gtk: bump to 2.32.4

Bug: https://bugs.gentoo.org/813489
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild | 300 +++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b9000c417c0..f33fca06d00 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
+DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
new file mode 100644
index 00000000000..4a8970427a6
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-60.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_WOFF2=ON
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     0c11ecfb402ccb13d335f04f3a837ea3d4b35707
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 06:37:18 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 06:37:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c11ecfb

net-libs/webkit-gtk: ppc64 stable wrt bug #813657

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 4a8970427a6..8bd28124e98 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     b2b72450bb5553114c9d30e7d460927f5159da03
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 21:35:18 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 21:35:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b72450

net-libs/webkit-gtk: amd64 stable wrt bug #813657

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 8bd28124e98..5f9eb15ecb1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     211bcaf451dec750fc8d61b9d1378f567a36ddbd
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 21:39:03 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 21:39:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211bcaf4

net-libs/webkit-gtk: x86 stable wrt bug #813657

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 5f9eb15ecb1..0a147824495 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     4c3d647e91369fd911066095cb2391e59fafc7d2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  6 23:04:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  6 23:05:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c3d647e

net-libs/webkit-gtk: Stabilize 2.32.4 arm64, #813657

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index baf38b8966a..2dd5eb64206 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     92f9219e6d599be43705104cd0ec092a8baae2fa
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  9 10:16:38 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 10:16:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f9219e

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/813489
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild | 300 ---------------------------
 2 files changed, 301 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index f33fca06d00..363640676e2 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.32.3.tar.xz 23323972 BLAKE2B da6f71214935fa13ee4d3214e3c34b636c2894f579539f0de4165e2fa51611cf8f57d40de9e3285a195b7e9f55fb9f5967722e01dcc78f9458b4fb74bc3e7e4a SHA512 473f89c6d56f6718e3e352a023d12188365b67cbe6535025205594729a10d792122275257b81ebe8e504a98814aa4e2a663616ffb13fea445df2b06929d89ebe
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
deleted file mode 100644
index 2dd5eb64206..00000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.3.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-60.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-unset wpe_depend
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.28.2-opengl-without-X-fixes.patch
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_WOFF2=ON
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
-		-DENABLE_WEBGL=${opengl_enabled}
-		# Supported only under ANGLE, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     384b33626910f37f195560ad494d77e7b5f3e1ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 22:58:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 23:07:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384b3362

net-libs/webkit-gtk: use libavif subslot operator

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{webkit-gtk-2.34.1.ebuild => webkit-gtk-2.34.1-r1.ebuild}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
similarity index 99%
rename from net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
index 3f751dd1114..fec3dc003ca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	dev-libs/hyphen
 	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
 	lcms? ( media-libs/lcms:2 )
 
 	egl? ( media-libs/mesa[egl(+)] )

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     2d6cec1e0c1dc2ac3aaf4166074690b30d04153b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  6 20:45:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  6 20:45:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6cec1e

net-libs/webkit-gtk: Stabilize 2.32.4 ppc, #769374

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 2dd5eb64206c..50c1d19b401f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     2a3070c9685daca965cb6d8cbac0b8bd6f3f96c5
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 16:10:10 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 17:27:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3070c9

net-libs/webkit-gtk: bump to 2.34.2

Closes: https://bugs.gentoo.org/822696
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild | 294 +++++++++++++++++++++++++++
 2 files changed, 295 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 781f160fbd1d..84d9671d42dc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
+DIST webkitgtk-2.34.2.tar.xz 24996572 BLAKE2B eb89965065e39d6cc2b54a4a167a19fee50387a25a5285b5eb369b6f2a7af550bff5b476fc27d5e4348c40e2523b76c31116d9ce2f70578f38ce81b2379143af SHA512 37c40fb067ee9f5bb8786bf2ce92aac885e9c5c2da4bc5f4e81682ccfb5eeb0aa94d5094f6aa99a9af216f542d1823094cf27aea13c7be3e5e6e3f6a9729c7a5

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild
new file mode 100644
index 000000000000..fec3dc003ca7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.2.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.34.1-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	# opengl needs to be explicetly handled, bug #576634
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     4cdf2c4a5caec04852158c6391f4978a84caa4df
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  2 22:43:52 2022 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 22:44:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cdf2c4a

net-libs/webkit-gtk: Drop support for disabling OpenGL

Instead of adding a REQUIRED_USE="^^ ( opengl gles2-only )"
simplify it to always enable opengl and swap from desktop to
ES variant with USE=gles2-only.

Closes: https://bugs.gentoo.org/820443
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 48 +++++++---------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index 1faf9e7222f8..b4da0e93b88e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -16,12 +16,12 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd wayland +X"
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 
 # gstreamer with opengl/gles2 needs egl
 REQUIRED_USE="
-	gles2-only? ( egl !opengl )
-	gstreamer? ( opengl? ( egl ) )
+	gles2-only? ( egl )
+	gstreamer? ( egl )
 	wayland? ( egl )
 	|| ( aqua wayland X )
 "
@@ -35,10 +35,6 @@ RESTRICT="test"
 # Various compile-time optionals for gtk+-3.22.0 - ensure it
 # Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
 # >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-wpe_depend="
-	>=gui-libs/libwpe-1.5.0:1.0
-	>=gui-libs/wpebackend-fdo-1.7.0:1.0
-"
 # TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
 RDEPEND="
 	>=x11-libs/cairo-1.16.0:=[X?]
@@ -66,8 +62,9 @@ RDEPEND="
 	spell? ( >=app-text/enchant-0.22:2 )
 	gstreamer? (
 		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
 		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
 		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
 		>=media-libs/gst-plugins-bad-1.14:1.0 )
 
@@ -86,12 +83,12 @@ RDEPEND="
 
 	egl? ( media-libs/mesa[egl(+)] )
 	gles2-only? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl )
+	!gles2-only? ( virtual/opengl )
 	wayland? (
 		dev-libs/wayland
 		>=dev-libs/wayland-protocols-1.12
-		opengl? ( ${wpe_depend} )
-		gles2-only? ( ${wpe_depend} )
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
 	)
 
 	seccomp? (
@@ -103,7 +100,6 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:= )
 	gamepad? ( >=dev-libs/libmanette-0.2.4 )
 "
-unset wpe_depend
 DEPEND="${RDEPEND}"
 # paxctl needed for bug #407085
 # Need real bison, not yacc
@@ -150,16 +146,6 @@ pkg_pretend() {
 			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
 		fi
 	fi
-
-	if ! use opengl && ! use gles2-only; then
-		ewarn
-		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
-		ewarn "This is an unsupported configuration meant for very specific embedded"
-		ewarn "use cases, where there truly is no GL possible (and even that use case"
-		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
-		ewarn "really really should be enabling OpenGL!"
-		ewarn
-	fi
 }
 
 pkg_setup() {
@@ -215,21 +201,11 @@ src_configure() {
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?
 
-	# opengl needs to be explicetly handled, bug #576634
-	local use_wpe_renderer=OFF
-	local opengl_enabled
-	if use opengl || use gles2-only; then
-		opengl_enabled=ON
-		use wayland && use_wpe_renderer=ON
-	else
-		opengl_enabled=OFF
-	fi
-
 	local mycmakeargs=(
 		${ruby_interpreter}
 		$(cmake_use_find_package gles2-only OpenGLES2)
 		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package opengl OpenGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
 		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
 		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
 		-DPORT=GTK
@@ -242,7 +218,7 @@ src_configure() {
 		-DENABLE_SPELLCHECK=$(usex spell)
 		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
 		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=${opengl_enabled}
+		-DENABLE_WEBGL=ON
 		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
 		# https://bugs.webkit.org/show_bug.cgi?id=225563
 		# https://bugs.webkit.org/show_bug.cgi?id=224888
@@ -261,12 +237,12 @@ src_configure() {
 		-DUSE_LIBHYPHEN=ON
 		-DUSE_LIBNOTIFY=$(usex libnotify)
 		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DUSE_OPENGL_OR_ES=ON
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_SOUP2=ON
 		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
 		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
 	)
 
 	# https://bugs.gentoo.org/761238

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     a2357e6a521e5e597df8d74fae226b7f1da10b45
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  2 21:22:08 2022 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 22:44:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2357e6a

net-libs/webkit-gtk: security bump to 2.34.3

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 294 +++++++++++++++++++++++++++
 2 files changed, 295 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 84d9671d42dc..40ab77d4b1bb 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
 DIST webkitgtk-2.34.2.tar.xz 24996572 BLAKE2B eb89965065e39d6cc2b54a4a167a19fee50387a25a5285b5eb369b6f2a7af550bff5b476fc27d5e4348c40e2523b76c31116d9ce2f70578f38ce81b2379143af SHA512 37c40fb067ee9f5bb8786bf2ce92aac885e9c5c2da4bc5f4e81682ccfb5eeb0aa94d5094f6aa99a9af216f542d1823094cf27aea13c7be3e5e6e3f6a9729c7a5
+DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
new file mode 100644
index 000000000000..f6b51ffd2814
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify +opengl seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+wpe_depend="
+	>=gui-libs/libwpe-1.5.0:1.0
+	>=gui-libs/wpebackend-fdo-1.7.0:1.0
+"
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		opengl? ( ${wpe_depend} )
+		gles2-only? ( ${wpe_depend} )
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+unset wpe_depend
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+
+	if ! use opengl && ! use gles2-only; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.34.1-opengl-without-X-fixes.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	# opengl needs to be explicetly handled, bug #576634
+	local use_wpe_renderer=OFF
+	local opengl_enabled
+	if use opengl || use gles2-only; then
+		opengl_enabled=ON
+		use wayland && use_wpe_renderer=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package opengl OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=${opengl_enabled}
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=${opengl_enabled}
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     094b880956dbbebb6b1a2b848080d1844c64b72e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 18:09:09 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 18:09:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094b8809

net-libs/webkit-gtk: Stabilize 2.34.3 x86, #830597

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index b4da0e93b88e..be9e9af9a56b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     d839fa3b7f7e2ec9cc88e75b49c6d497e939c43f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  6 15:01:17 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 15:01:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d839fa3b

net-libs/webkit-gtk: amd64 stable wrt bug #830597

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index be9e9af9a56b..a21471f285eb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     be55c8ca6d87f96b05daa87367d40cdfdbc6730e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 12:48:57 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 12:49:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be55c8ca

net-libs/webkit-gtk: Stabilize 2.34.3 arm, #830597

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index a21471f285eb..f028dacdd4ca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     03369fe34344adaf002a96c9ed3e5d2fd78487f9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  8 12:49:01 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  8 12:49:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03369fe3

net-libs/webkit-gtk: Stabilize 2.34.3 ppc, #830597

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index f028dacdd4ca..66ff477c7c80 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     4957425c27003a03929a3521538a56836a7c3a0d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 18:57:53 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 18:57:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4957425c

net-libs/webkit-gtk: Stabilize 2.34.3 arm64, #830597

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index aa79d69ea210..ad4b0169d88f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     aa8c75638bbc8e9d35f33478ab3b0e18b83f19dc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 02:44:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 02:45:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8c7563

net-libs/webkit-gtk: test if linker supports --no-keep-memory

For example, mold doesn't.

Closes: https://bugs.gentoo.org/831282
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index ad4b0169d88f..a6cb56d76a50 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -184,7 +184,7 @@ src_configure() {
 	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
 	# --no-keep-memory doesn't work on ia64, bug #502492
 	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
 	fi
 
 	# Ruby situation is a bit complicated. See bug 513888

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     c5ce637aa298d4a57b649fcf5256826cd9b05ebd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 12:25:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 12:25:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ce637a

net-libs/webkit-gtk: Stabilize 2.34.3 ppc64, #830597

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index a6cb56d76a50..940e11a2d115 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     f5bad592e6fceebff1ebf5a0d488c9d732f49e42
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 21:54:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 01:17:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5bad592

net-libs/webkit-gtk: security bump to 2.34.4

Bug: https://bugs.gentoo.org/831739
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild | 272 +++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e3070fd7c047..08f22bd903cf 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
+DIST webkitgtk-2.34.4.tar.xz 24388604 BLAKE2B ba483a2457b25ff33d0ffb85ec7fc681390089c69c774d91821a9f23683a473ba86696bf393ba3368058227f4f9c95c84cbd3156f13ddd8331e427ecd13b84a3 SHA512 1a511ac6cb83cb602ecd8a56b3f6d00668de7fca74fcd5c6ce09e36af38b41742edc0bf572780867376aa27dd67d3aa451155f71d04bcdd3cba02c1f4f014df7

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
new file mode 100644
index 000000000000..4e9e49ed57c4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     f4dc6db443f6aeb4979343a7d8ec8543459d7a6b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 09:45:18 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 09:45:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4dc6db4

net-libs/webkit-gtk: amd64 stable wrt bug #831763

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
index 4e9e49ed57c4..f4d17beee660 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     43b0c266fcb99f7eae75d803087fb7e65342d751
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 09:48:29 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 09:48:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b0c266

net-libs/webkit-gtk: x86 stable wrt bug #831763

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
index f4d17beee660..3d7f52870d16 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     894c20ddf88fdf3c697040c9e68aab9b4a1bffee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 02:01:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 02:01:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894c20dd

net-libs/webkit-gtk: Stabilize 2.34.4 arm64, #831763

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
index 3d7f52870d16..1f42b79567da 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     873bf3aa31ec4bd58ad472ede5020b734f90f31d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  9 19:11:03 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 19:12:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873bf3aa

net-libs/webkit-gtk: Version bump to 2.34.5

Bug: https://bugs.gentoo.org/832990
Closes: https://bugs.gentoo.org/832894
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 273 +++++++++++++++++++++++++++
 2 files changed, 274 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 08f22bd903cf..6bdbbc95aaaf 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
 DIST webkitgtk-2.34.4.tar.xz 24388604 BLAKE2B ba483a2457b25ff33d0ffb85ec7fc681390089c69c774d91821a9f23683a473ba86696bf393ba3368058227f4f9c95c84cbd3156f13ddd8331e427ecd13b84a3 SHA512 1a511ac6cb83cb602ecd8a56b3f6d00668de7fca74fcd5c6ce09e36af38b41742edc0bf572780867376aa27dd67d3aa451155f71d04bcdd3cba02c1f4f014df7
+DIST webkitgtk-2.34.5.tar.xz 24393772 BLAKE2B 7a75ec1507864c7a42305485beb4e1b78b7287b3c514949b1bbe794857b89d6ba894040968002120eba91d15f58b4f51169233457865bc524b28d296ba323662 SHA512 a708e23bb6bcc6b281f1de35f4c56a5360b8212a3749d931f8a3c39402761f30d7524d0bddf4e6cfb1b2fc753df28853dceb476c432bac3c453e4b2123e7e9d5

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
new file mode 100644
index 000000000000..06e6e40c4eae
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Ionen Wolkens]

commit:     9cbf4a0dc3a6b6412acadc9558d4d068f5af860e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  9 22:25:24 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 22:26:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbf4a0d

net-libs/webkit-gtk: add back virtualx for now

Until further investigation, likely just need to add test to IUSE.

Acked-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index 06e6e40c4eae..d95ffa4b27a3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -6,7 +6,7 @@ PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{8..10} )
 USE_RUBY="ruby26 ruby27 ruby30"
 
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
 
 MY_P="webkitgtk-${PV}"
 DESCRIPTION="Open source web browser engine"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     42ea50ece9073a77bbeed06e8190a44fd63fa99f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 12:24:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 12:24:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ea50ec

net-libs/webkit-gtk: Stabilize 2.34.4 arm, #831763

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
index 1f42b79567da..69393dc36b1b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     ea3d70c38eaefbb9f361fa7ae1acacd7206fe20a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 07:53:21 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 07:53:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea3d70c3

net-libs/webkit-gtk: amd64 stable wrt bug #833254

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index d95ffa4b27a3..766efb607634 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     d080ad89b6b62eea7d91ae38ed8462901bed43ee
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 08:41:01 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 08:41:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d080ad89

net-libs/webkit-gtk: Stabilize 2.34.5 x86, #833254

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index 766efb607634..921131e917a1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     2eb891f1b4c67cff37c8959d79059e022290c161
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 03:29:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 03:29:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb891f1

net-libs/webkit-gtk: Stabilize 2.34.5 ppc, #833254

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index 921131e917a1..9680a6e2ee86 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     3a8fe437c56fe065b641da397b630db757573eea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 03:29:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 03:29:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8fe437

net-libs/webkit-gtk: Stabilize 2.34.5 ppc64, #833254

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index 9680a6e2ee86..d06b6d1b0868 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     f103767bfcbc3d7e664111ddb822ffea35975b35
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 03:41:25 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 03:44:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f103767b

net-libs/webkit-gtk: Version bump to 2.34.6

Bug: https://bugs.gentoo.org/833568
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 272 +++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6bdbbc95aaaf..b18c05896f87 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
 DIST webkitgtk-2.34.4.tar.xz 24388604 BLAKE2B ba483a2457b25ff33d0ffb85ec7fc681390089c69c774d91821a9f23683a473ba86696bf393ba3368058227f4f9c95c84cbd3156f13ddd8331e427ecd13b84a3 SHA512 1a511ac6cb83cb602ecd8a56b3f6d00668de7fca74fcd5c6ce09e36af38b41742edc0bf572780867376aa27dd67d3aa451155f71d04bcdd3cba02c1f4f014df7
 DIST webkitgtk-2.34.5.tar.xz 24393772 BLAKE2B 7a75ec1507864c7a42305485beb4e1b78b7287b3c514949b1bbe794857b89d6ba894040968002120eba91d15f58b4f51169233457865bc524b28d296ba323662 SHA512 a708e23bb6bcc6b281f1de35f4c56a5360b8212a3749d931f8a3c39402761f30d7524d0bddf4e6cfb1b2fc753df28853dceb476c432bac3c453e4b2123e7e9d5
+DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab SHA512 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
new file mode 100644
index 000000000000..9026058205df
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a1c060595fc5148ad75dc363549422f64a338a15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 04:36:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 04:36:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c06059

net-libs/webkit-gtk: Stabilize 2.34.5 arm64, #833254

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index d06b6d1b0868..8ec512f8e8c1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a2b47e940f3c7b132124409e7999c7faaf22c5f7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 17:48:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 17:48:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b47e94

net-libs/webkit-gtk: Stabilize 2.34.5 arm, #833254

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
index 8ec512f8e8c1..c99a1e40ec91 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     e937995c254db22a625b5f347971182ae60452cb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 05:09:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 05:09:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e937995c

net-libs/webkit-gtk: Stabilize 2.34.6 x86, #833923

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
index 9026058205df..edc5ba771cbc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a3d1e477de5f105fa99c598252bd9d75d40c6b78
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 05:10:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 05:10:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d1e477

net-libs/webkit-gtk: Stabilize 2.34.6 amd64, #833923

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
index edc5ba771cbc..129a7c1adf44 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     d5526c1acd16c113397ef0c689aadc00fe88ab94
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 19:18:08 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 19:23:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5526c1a

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/831739
Bug: https://bugs.gentoo.org/832990
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 272 ---------------------------
 net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild | 272 ---------------------------
 3 files changed, 546 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b18c05896f87..a41ca47e6f05 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
-DIST webkitgtk-2.34.4.tar.xz 24388604 BLAKE2B ba483a2457b25ff33d0ffb85ec7fc681390089c69c774d91821a9f23683a473ba86696bf393ba3368058227f4f9c95c84cbd3156f13ddd8331e427ecd13b84a3 SHA512 1a511ac6cb83cb602ecd8a56b3f6d00668de7fca74fcd5c6ce09e36af38b41742edc0bf572780867376aa27dd67d3aa451155f71d04bcdd3cba02c1f4f014df7
 DIST webkitgtk-2.34.5.tar.xz 24393772 BLAKE2B 7a75ec1507864c7a42305485beb4e1b78b7287b3c514949b1bbe794857b89d6ba894040968002120eba91d15f58b4f51169233457865bc524b28d296ba323662 SHA512 a708e23bb6bcc6b281f1de35f4c56a5360b8212a3749d931f8a3c39402761f30d7524d0bddf4e6cfb1b2fc753df28853dceb476c432bac3c453e4b2123e7e9d5
 DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab SHA512 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
deleted file mode 100644
index 940e11a2d115..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
deleted file mode 100644
index 69393dc36b1b..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.4.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#		jit? ( sys-apps/paxctl ) )
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
-	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
-		# https://bugs.webkit.org/show_bug.cgi?id=225563
-		# https://bugs.webkit.org/show_bug.cgi?id=224888
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     c0679eed19a4ea52da6ad34d02a3981c8aef08eb
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 02:15:28 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 02:29:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0679eed

net-libs/webkit-gtk: Version bump to 2.36.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild | 249 +++++++++++++++++++++++++++
 2 files changed, 250 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a41ca47e6f05..37dc6be0153d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.34.5.tar.xz 24393772 BLAKE2B 7a75ec1507864c7a42305485beb4e1b78b7287b3c514949b1bbe794857b89d6ba894040968002120eba91d15f58b4f51169233457865bc524b28d296ba323662 SHA512 a708e23bb6bcc6b281f1de35f4c56a5360b8212a3749d931f8a3c39402761f30d7524d0bddf4e6cfb1b2fc753df28853dceb476c432bac3c453e4b2123e7e9d5
 DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab SHA512 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
+DIST webkitgtk-2.36.0.tar.xz 26900828 BLAKE2B d965c9a0f3ff03d55baba840af7fe0cb3288eaa982f1444aa14a499542d89766815954b9e62b5d39d9536074d59e42d1c0798c5e1d88974f070c239ef1d8eae5 SHA512 0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
new file mode 100644
index 000000000000..e7c6a0c29d64
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=gui-libs/gtk-3.98:4[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEBGL2=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=ON
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     0f16f9f5ad7a45c2561b0bed4f71ad18f9702d5b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 06:59:54 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 07:00:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f16f9f5

net-libs/webkit-gtk: Don't try to use GTK4

Closes: https://bugs.gentoo.org/836131
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
index e7c6a0c29d64..bd80edb4b8fa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	>=media-libs/fontconfig-2.13.0:1.0
 	>=media-libs/freetype-2.9.0:2
 	>=dev-libs/libgcrypt-1.7.0:0=
-	>=gui-libs/gtk-3.98:4[aqua?,introspection?,wayland?,X?]
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
 	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
 	>=dev-libs/icu-61.2:=
 	virtual/jpeg:0=
@@ -229,7 +229,7 @@ src_configure() {
 		-DENABLE_X11_TARGET=$(usex X)
 		-DUSE_ANGLE_WEBGL=ON
 		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON
+		-DUSE_GTK4=OFF
 		-DUSE_JPEGXL=OFF
 		-DUSE_LCMS=$(usex lcms)
 		-DUSE_LIBHYPHEN=ON

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     981d16504d0e25c986cffd793feb824dcaa6df26
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 17:38:39 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 17:40:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=981d1650

net-libs/webkit-gtk: Disable USE_ANGLE_WEBGL

Closes: https://bugs.gentoo.org/836160
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../{webkit-gtk-2.36.0.ebuild => webkit-gtk-2.36.0-r1.ebuild}        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild
similarity index 98%
rename from net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild
index bd80edb4b8fa..d7f285d8177b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.0-r1.ebuild
@@ -217,7 +217,8 @@ src_configure() {
 		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
 		-DENABLE_VIDEO=$(usex gstreamer)
 		-DENABLE_WEBGL=ON
-		-DENABLE_WEBGL2=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
 		-DENABLE_WEB_AUDIO=$(usex gstreamer)
 		# Source/cmake/OptionsGTK.cmake
 		-DENABLE_GLES2=$(usex gles2-only)
@@ -227,7 +228,7 @@ src_configure() {
 		-DENABLE_QUARTZ_TARGET=$(usex aqua)
 		-DENABLE_WAYLAND_TARGET=$(usex wayland)
 		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_ANGLE_WEBGL=ON
+		-DUSE_ANGLE_WEBGL=OFF
 		-DUSE_AVIF=$(usex avif)
 		-DUSE_GTK4=OFF
 		-DUSE_JPEGXL=OFF

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     03f2eb54eaeb9efe55c1bc9bae77934239e452e6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 07:21:59 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 07:21:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f2eb54

net-libs/webkit-gtk: Stabilize 2.34.6 ppc64, #833923

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
index 129a7c1adf44..65b8135d4d8d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     51d3fb0bbe50aa66c18d75f517d893ef10c5f481
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 07:22:03 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 07:22:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d3fb0b

net-libs/webkit-gtk: Stabilize 2.34.6 ppc, #833923

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
index 65b8135d4d8d..c3db8cc69af4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     076c17edffc037ff0cd140aace642720179ee73f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 07:23:39 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 07:23:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076c17ed

net-libs/webkit-gtk: Stabilize 2.34.6 arm, #833923

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
index c3db8cc69af4..bc14607662e0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     0af0d0c74fdab7a59a6757e07cdae97e01bacd50
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 21:02:26 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 21:02:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af0d0c7

net-libs/webkit-gtk: Stabilize 2.34.6 arm64, #833923

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
index bc14607662e0..6c420cdeac2f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     ae77c5534260700f61de1d44ecd059d1b3cdbf5f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 23:01:54 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 23:02:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae77c553

net-libs/webkit-gtk: Version bump to 2.36.1

Bug: https://bugs.gentoo.org/839984
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1c550015327d..756881a72c9c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.34.6.tar.xz 24393340 BLAKE2B 7ab93a81f6c74ff712ddb057cbba758978b978323098071e9e35e3aa8efab4c747b8375e10a302185a82b0e89d822c89d199d2d4092c4acd9a423c1f6696c2ab SHA512 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
 DIST webkitgtk-2.36.0.tar.xz 26900828 BLAKE2B d965c9a0f3ff03d55baba840af7fe0cb3288eaa982f1444aa14a499542d89766815954b9e62b5d39d9536074d59e42d1c0798c5e1d88974f070c239ef1d8eae5 SHA512 0926a792da295b8efa8c0fb80fbb0cb27c43bb86011317d076fbe5eef347f2bc02e8afc4c75699a5c6a14363f4abcbfa2d941fdddd6646a63c7679e2380080da
+DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
new file mode 100644
index 000000000000..d7f285d8177b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     3453a9bc56e99424ab1d2a432469f184df250325
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 15:10:16 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed May  4 15:10:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3453a9bc

net-libs/webkit-gtk: Stabilize 2.36.1 x86, #842435

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index d7f285d8177b..35a385d63c06 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     54b76b93363f9f8239ee38b3fe8a4e7c9af18167
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 18:28:38 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May  7 18:28:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b76b93

net-libs/webkit-gtk: Keyword 2.36.1 ppc, #838709

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 35a385d63c06..5bea39657c1d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     ffbb15282b73d60e5259b436e6ff07c4f8305cf9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 18:05:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May  8 18:05:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbb1528

net-libs/webkit-gtk: Stabilize 2.36.1 amd64, #842435

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 5bea39657c1d..6adda65095ae 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     6fffe6aabf346a24e41f73e811a48fb0cad93776
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 08:21:04 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 10 08:21:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fffe6aa

net-libs/webkit-gtk: ppc64 stable wrt bug #842435

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 6adda65095ae..913bbc5c3726 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     ef7c454b6bab5d33cc8d01d1efc1e54fd1067f6e
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 06:54:38 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri May 13 06:54:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef7c454b

net-libs/webkit-gtk: Stabilize 2.36.1 arm64, #842435

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 913bbc5c3726..0bd40cfda22f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     ff33dd2499973739e06a7ab700ada0980731936f
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 06:55:33 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri May 13 06:55:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff33dd24

net-libs/webkit-gtk: Stabilize 2.36.1 arm, #842435

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 0bd40cfda22f..5788eab68e00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     0c50210884b89147cdc54db61380af201d3c860f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 12:43:41 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 13 12:43:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c502108

net-libs/webkit-gtk: Stabilize 2.36.1 ppc, #842435

~ppc was added after the security stabilization bug was opened.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 5788eab68e00..5a33443fb383 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     57456d1c6f6956cb5f1e07786324429f205e823f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 13:09:04 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 13 13:09:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57456d1c

net-libs/webkit-gtk: Stabilize 2.36.1 sparc, #842435

~sparc was added after the security stabilization bug was opened.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 5a33443fb383..3193f75332e8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     7a511df48602038bcd5333f65bb1ccc28fe86d1c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 13:13:10 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 13 13:13:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a511df4

net-libs/webkit-gtk: Drop sparc keyword to ~sparc

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
index 3193f75332e8..bb28e81e3161 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     169adc81f429529590c778c8f923663ae547f7af
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 16:23:39 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 18 16:26:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169adc81

net-libs/webkit-gtk: Version bump to 2.36.2

* Raise gst dependency to >=1.20 (bug #843950)

Bug: https://bugs.gentoo.org/845252
Closes: https://bugs.gentoo.org/843950
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.2.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c249cb878e29..e63783a4835e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
+DIST webkitgtk-2.36.2.tar.xz 26444132 BLAKE2B 5ad4f3aad0e5c984a2c18b32faf13b5357828a010b64f35d743f5fc3b45c6912339b2d1996735ca690547c8cdc3aceaeac2c89e104d4addd29ab47aa4a139ab3 SHA512 00849ab0a4f6deca4287d3556ee10d9779197fcb618045174c3d39ff1847937bd3fe4208a39a13c53ebf7e2fe35a915494ddf6bec1120100dfba8695c883154a

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.2.ebuild
new file mode 100644
index 000000000000..0ea228016a8e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.2.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     86cf7dde6f6cc1fdde18de42b2f66e7886c2e35e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 01:16:08 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 29 01:17:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cf7dde

net-libs/webkit-gtk: Version bump to 2.36.3

Bug: https://bugs.gentoo.org/845252
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e63783a4835e..851d58b2a81e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
 DIST webkitgtk-2.36.2.tar.xz 26444132 BLAKE2B 5ad4f3aad0e5c984a2c18b32faf13b5357828a010b64f35d743f5fc3b45c6912339b2d1996735ca690547c8cdc3aceaeac2c89e104d4addd29ab47aa4a139ab3 SHA512 00849ab0a4f6deca4287d3556ee10d9779197fcb618045174c3d39ff1847937bd3fe4208a39a13c53ebf7e2fe35a915494ddf6bec1120100dfba8695c883154a
+DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
new file mode 100644
index 000000000000..4743940081ea
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     9e37a5481cdd16598433ce2da152471837f46ee2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 17:16:29 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 17:20:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e37a548

net-libs/webkit-gtk: Unconditionalize gdbus-codegen dep

Also drop unnecessary dev-util/cmake dependency.

Closes: https://bugs.gentoo.org/851027
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 4743940081ea..0775f3c2b3fe 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -107,6 +107,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	${RUBY_DEPS}
 	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
@@ -120,8 +121,6 @@ BDEPEND="
 	virtual/perl-JSON-PP
 
 	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
 "
 #	test? (
 #		dev-python/pygobject:3[python_targets_python2_7]

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     e44e80db0e8ebc840f39436c8a95921b8d60e7c5
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 07:36:25 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 07:36:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44e80db

net-libs/webkit-gtk: Stabilize 2.36.3 arm64, #851948

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 0775f3c2b3fe..e67d77c4174e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     4f8352819233baf66ea0dfb5c58e752207d3235c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 08:09:30 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 08:09:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f835281

net-libs/webkit-gtk: amd64 stable wrt bug #851948

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index e67d77c4174e..032eb1724043 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     b01f06542539fb3e12f2a6f067a879d478f77f9c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 06:58:19 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 06:58:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01f0654

net-libs/webkit-gtk: x86 stable wrt bug #851948

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 032eb1724043..66607964ddb9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     e418c0fe0e94f6cf27815f48e445a33318237188
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 15:07:09 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 15:07:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e418c0fe

net-libs/webkit-gtk: Stabilize 2.36.3 ppc, #851948

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 66607964ddb9..2cf63da58d16 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     cff466ea36f15dcddc66b3347434d152b682eceb
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 15:07:23 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 15:07:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff466ea

net-libs/webkit-gtk: Stabilize 2.36.3 ppc64, #851948

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 2cf63da58d16..7cf7405ca3fc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     7099463b7414be4e89265f88b788fd81813be77b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 19:23:32 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 19:23:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7099463b

net-libs/webkit-gtk: Stabilize 2.36.3 arm, #851948

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
index 7cf7405ca3fc..32a324c88e1e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     3eeb7feb045225c1cb5340d78746fd5718f2b064
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 19:24:34 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 19:25:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eeb7feb

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/845252
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild | 250 ---------------------------
 2 files changed, 251 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index be9de8d68143..8646d8649ef3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
deleted file mode 100644
index bb28e81e3161..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.14:1.0
-		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-	geolocation? ( dev-util/gdbus-codegen )
-	>=dev-util/cmake-3.10
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_ANGLE_WEBGL=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     ee464019c9d81b327ec31a2d6da30f20fb8166f9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 16:34:43 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 16:38:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee464019

net-libs/webkit-gtk: Version bump to 2.36.4

* Apply patch from ayuayuayu <AT> aaathats3as.com to remove IUSE=geolocation
  (bug #852752)

Bug: https://bugs.gentoo.org/856445
Closes: https://bugs.gentoo.org/852752
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8646d8649ef3..1cb21de62d16 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
+DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
new file mode 100644
index 000000000000..ac5ee1a431b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     e8b3a8e939ae580f10dff95e7f50d59f12db3571
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 17:07:20 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 17:07:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b3a8e9

net-libs/webkit-gtk: x86 stable wrt bug #858146

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index ac5ee1a431b0..4c0e2f648f40 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     b9057c40439ecdd1e57419776ae6ffcefdf856f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 19:42:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 19:42:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9057c40

net-libs/webkit-gtk: Stabilize 2.36.4 arm64, #858146

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index 4c0e2f648f40..6546d37342c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     c0efca49ce7e6de67ac2683e028214a7d48a1048
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 07:06:08 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 07:06:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0efca49

net-libs/webkit-gtk: amd64 stable wrt bug #858146

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index bfc902de737f..3aa90d8ef1dc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     17cca544e5a7e4bd8d25dedd3b9982a879ee187b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 02:19:34 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 02:23:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cca544

net-libs/webkit-gtk: Version bump to 2.36.5

Bug: https://bugs.gentoo.org/861740
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1cb21de62d16..ef43f846c0d1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
+DIST webkitgtk-2.36.5.tar.xz 26602060 BLAKE2B 4a450356bb5e142f8c5c9d27433183532b7d3a2e451032cd837bf8a12ba58bd997eb4f2c6ff5ab37891af8485efb5d57aa02321448a93b0864c2a25b3b194cf8 SHA512 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
new file mode 100644
index 000000000000..ac5ee1a431b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     05eab2642f897f5677f10e975887b54c5a8a0804
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 08:03:03 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 08:03:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05eab264

net-libs/webkit-gtk: amd64 stable wrt bug #861797

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
index ad7b4de216cf..50d73feca113 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     3615866f241aa58a5c3d742ea9174eeb012454a5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 07:16:02 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 07:16:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3615866f

net-libs/webkit-gtk: x86 stable wrt bug #861797

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
index 50d73feca113..7c6f107b4167 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     b579da4999ae25e8f7e1f15539e670e1233a6734
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  8 00:26:58 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 00:27:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b579da49

net-libs/webkit-gtk: Version bump to 2.36.6

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ef43f846c0d1..a7e2bc7866b0 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
 DIST webkitgtk-2.36.5.tar.xz 26602060 BLAKE2B 4a450356bb5e142f8c5c9d27433183532b7d3a2e451032cd837bf8a12ba58bd997eb4f2c6ff5ab37891af8485efb5d57aa02321448a93b0864c2a25b3b194cf8 SHA512 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
+DIST webkitgtk-2.36.6.tar.xz 26593904 BLAKE2B 95ea4b17350b148fe6cc9bbaa4aab3bbb992ab62f949d6a70639cc9c31bba1d9d1a67185a4e61464c66bce10399f1b4fa7811bc892b59c2b9677cfe4f8bc8db8 SHA512 21e91d7b9a4af3b6c7eb7a8dd9fbbbd82c14d01a5cd6734c9476bcc6b81007dc622867f3c6cb1e5531a16c5abfe208f8540ca0a182fa02e274b46ebc4f9dd0d0

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
new file mode 100644
index 000000000000..ac5ee1a431b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     74287081832c97be41512ce6156666c393bd3f64
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 00:22:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 00:22:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74287081

net-libs/webkit-gtk: Stabilize 2.36.4 ppc, #858146

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index 3aa90d8ef1dc..354bfcf06e03 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     7b4d4c44ab28763dc1315cbfa16326f032e2b35d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 00:22:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 00:22:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4d4c44

net-libs/webkit-gtk: Stabilize 2.36.4 ppc64, #858146

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index 354bfcf06e03..6b8011fcb778 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     c2fa4a901ce717e93c8c3d8889ae382dabb0b1e7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 07:05:46 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 07:06:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fa4a90

net-libs/webkit-gtk: amd64 stable wrt bug #865341

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
index ac5ee1a431b0..e3663f93021d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Agostino Sarubbo]

commit:     13ac8604f0f77fea944e7f2fc83096407e1ff95d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 07:09:50 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 07:09:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ac8604

net-libs/webkit-gtk: x86 stable wrt bug #865341

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
index e3663f93021d..79e452c58aae 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     63ff6cab372c6d81f29648ba0ceb8cb5f37a1672
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 00:16:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 00:16:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ff6cab

net-libs/webkit-gtk: Stabilize 2.36.6 arm64, #865341

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
index 79e452c58aae..d69ff514c6db 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     ea97c37ff098b4d0dacff27eea5fe0526e0182bd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 17:30:47 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 17:31:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea97c37f

net-libs/webkit-gtk: Version bump to 2.36.7

Bug: https://bugs.gentoo.org/866494
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a7e2bc7866b0..8cf7223294c3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,3 +2,4 @@ DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc41
 DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
 DIST webkitgtk-2.36.5.tar.xz 26602060 BLAKE2B 4a450356bb5e142f8c5c9d27433183532b7d3a2e451032cd837bf8a12ba58bd997eb4f2c6ff5ab37891af8485efb5d57aa02321448a93b0864c2a25b3b194cf8 SHA512 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
 DIST webkitgtk-2.36.6.tar.xz 26593904 BLAKE2B 95ea4b17350b148fe6cc9bbaa4aab3bbb992ab62f949d6a70639cc9c31bba1d9d1a67185a4e61464c66bce10399f1b4fa7811bc892b59c2b9677cfe4f8bc8db8 SHA512 21e91d7b9a4af3b6c7eb7a8dd9fbbbd82c14d01a5cd6734c9476bcc6b81007dc622867f3c6cb1e5531a16c5abfe208f8540ca0a182fa02e274b46ebc4f9dd0d0
+DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
new file mode 100644
index 000000000000..ac5ee1a431b0
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     e6cf9f6c32e9dbff3ad17b5a1ca85e61d64afcb2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 23:51:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 23:51:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cf9f6c

net-libs/webkit-gtk: Stabilize 2.36.7 amd64, #865341

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
index ac5ee1a431b0..e3663f93021d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     d5d33d9b38a2407f86c11774268a7b199de9e9b1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 14:31:26 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 14:31:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d33d9b

net-libs/webkit-gtk: Stabilize 2.36.7 ppc64, #865341

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
index 67063b7d6bee..70239235e6af 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     91826f77a92bf42c18cce19d53c1a1f8b2475483
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 14:31:14 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 14:31:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91826f77

net-libs/webkit-gtk: Stabilize 2.36.7 ppc, #865341

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
index e3663f93021d..67063b7d6bee 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Jakov Smolić]

commit:     6408917222db998cb871bc34183b3bf3022ed526
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 09:18:12 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 09:18:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64089172

net-libs/webkit-gtk: Stabilize 2.36.7 x86, #865341

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
index 70239235e6af..63205e177593 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     7af56d38ec008fb2b01d7996e677a004bfd401ba
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 17:53:53 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 17:54:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af56d38

net-libs/webkit-gtk: Stabilize 2.36.7 arm64, #865341

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
index 9613d84c361a..6b8011fcb778 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     dffbf285cb99d96b7974408e1de53fb078efb794
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 17:53:42 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 17:54:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dffbf285

net-libs/webkit-gtk: Stabilize 2.36.7 arm, #865341

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
index 63205e177593..9613d84c361a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     343690882bf938c06ed021e64fa1869311c4f982
Author:     brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Fri Sep 16 18:45:42 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 18:51:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34369088

net-libs/webkit-gtk: Version bump to 2.36.8

Closes: https://github.com/gentoo/gentoo/pull/27283
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild | 250 +++++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e7864a39344d..38907cb646ff 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
+DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild
new file mode 100644
index 000000000000..3891152a3b59
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     8747e6c1a862216a909e3e3ff9d76171324723d7
Author:     brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Tue Sep 27 13:52:32 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 15:36:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8747e6c1

net-libs/webkit-gtk: Version bump to 2.38.0

The slotting is to handle libsoup3 and libsoup2. Some packages from
GNOME 43 are requiring webkit2gtk-4.1 (gtk3 with libsoup3), for example
GNOME boxes.

Closes: https://bugs.gentoo.org/872581
Closes: https://github.com/gentoo/gentoo/pull/27357
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild | 259 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild      | 249 +++++++++++++++++++++
 3 files changed, 509 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 38907cb646ff..89dbbc5729dc 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
 DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
+DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
new file mode 100644
index 000000000000..f7ae48a1c9d7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
new file mode 100644
index 000000000000..c37062df4a5e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     55147858ab7c460db75bc4b5dfeda722fd37531c
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Fri Oct 21 23:08:19 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 15:25:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55147858

net-libs/webkit-gtk: Version bump to 2.38.1

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27900
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild | 259 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild | 253 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild      | 249 +++++++++++++++++++++
 4 files changed, 762 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 89dbbc5729dc..9f42148ee299 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
 DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
 DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525
+DIST webkitgtk-2.38.1.tar.xz 33006384 BLAKE2B 404ff4e52331f9fe929922a23bed8ab5a70cb2a6523ae23c390415bfbd3c88797f91f95b74c9c8301f462bff708c85dc7155d6b37d2c3a66d4794ca184e1ca7c SHA512 d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
new file mode 100644
index 000000000000..0992b464692b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
new file mode 100644
index 000000000000..6b8fac2e5658
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
new file mode 100644
index 000000000000..ed868176aaa5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     2889eb78b0d94b1255f3a5a6fd6afa940883bfd6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 21:20:36 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 17:58:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2889eb78

net-libs/webkit-gtk: Set remote-id

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/metadata.xml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index ce3ed547574b..cd0721b7c3f8 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
-	<flag name="egl">Enable EGL support</flag>
-	<flag name="examples">Install the MiniBrowser example application</flag>
-	<flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
-	<flag name="jumbo-build">Combine source files to speed up build process</flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
+    <flag name="egl">Enable EGL support</flag>
+    <flag name="examples">Install the MiniBrowser example application</flag>
+    <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
+    <flag name="jumbo-build">Combine source files to speed up build process</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">WebKit/WebKit</remote-id>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     4430fac2668d50c31905c542541a8a8aefbc3ee7
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 02:25:46 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 02:28:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4430fac2

net-libs/webkit-gtk: Version bump to 2.38.2

Bug: https://bugs.gentoo.org/879571
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 259 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild | 253 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild      | 249 +++++++++++++++++++++
 4 files changed, 762 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9f42148ee299..5df75a8f006e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,3 +2,4 @@ DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90
 DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
 DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525
 DIST webkitgtk-2.38.1.tar.xz 33006384 BLAKE2B 404ff4e52331f9fe929922a23bed8ab5a70cb2a6523ae23c390415bfbd3c88797f91f95b74c9c8301f462bff708c85dc7155d6b37d2c3a66d4794ca184e1ca7c SHA512 d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2
+DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
new file mode 100644
index 000000000000..529800cbc326
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
new file mode 100644
index 000000000000..521249210dfd
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
new file mode 100644
index 000000000000..6db10244f97d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     0f937126e4cb56691093b9bf0e7f0760a82a384a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  9 14:06:00 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov  9 14:07:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f937126

net-libs/webkit-gtk: Specify -DPython_EXECUTABLE

Closes: https://bugs.gentoo.org/879835
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild | 1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
index 529800cbc326..2ce906d0bd00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -195,6 +195,7 @@ src_configure() {
 	# should somehow let user select between them?
 
 	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
 		${ruby_interpreter}
 		$(cmake_use_find_package gles2-only OpenGLES2)
 		$(cmake_use_find_package egl EGL)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
index 521249210dfd..71c036b210ae 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
@@ -197,6 +197,7 @@ src_configure() {
 	# should somehow let user select between them?
 
 	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
 		${ruby_interpreter}
 		$(cmake_use_find_package gles2-only OpenGLES2)
 		$(cmake_use_find_package egl EGL)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index 6db10244f97d..a62b480222e4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -193,6 +193,7 @@ src_configure() {
 	# should somehow let user select between them?
 
 	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
 		${ruby_interpreter}
 		$(cmake_use_find_package gles2-only OpenGLES2)
 		$(cmake_use_find_package egl EGL)

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     da5ad84b1e0a34bc7f0041bad3d685d61e4ab23f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 01:30:57 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 02:37:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5ad84b

net-libs/webkit-gtk: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   3 -
 net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild      | 250 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild | 259 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild | 252 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild      | 249 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild | 259 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild | 253 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild      | 249 ---------------------
 8 files changed, 1774 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5df75a8f006e..28363b37f660 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,2 @@
 DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
-DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
-DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525
-DIST webkitgtk-2.38.1.tar.xz 33006384 BLAKE2B 404ff4e52331f9fe929922a23bed8ab5a70cb2a6523ae23c390415bfbd3c88797f91f95b74c9c8301f462bff708c85dc7155d6b37d2c3a66d4794ca184e1ca7c SHA512 d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild
deleted file mode 100644
index 3891152a3b59..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.8.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_ANGLE_WEBGL=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
deleted file mode 100644
index f7ae48a1c9d7..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild
deleted file mode 100644
index 1346c001c23b..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.0-r500.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
deleted file mode 100644
index c37062df4a5e..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
deleted file mode 100644
index 0992b464692b..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
deleted file mode 100644
index 6b8fac2e5658..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.1-r500.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
-
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
deleted file mode 100644
index ed868176aaa5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	|| ( >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/atk-2.16.0 )
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     c5c8309606f2125d8f5d448e8b448c834b6ce801
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:35:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:35:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c83096

net-libs/webkit-gtk: Stabilize 2.38.2 amd64, #879809

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index a62b480222e4..70832664f47e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     97968af6cdabd212fbe7bd5425bbf1a34b0d389b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:35:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:35:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97968af6

net-libs/webkit-gtk: Stabilize 2.38.2 ppc64, #879809

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index dde11e2a9787..ebed392c80ad 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     820952638588f24b80368360cc61c3767024ef0e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:35:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:35:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82095263

net-libs/webkit-gtk: Stabilize 2.38.2 ppc, #879809

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index 70832664f47e..dde11e2a9787 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a18cffe99a841388d3cbf50fb4911f489320dc30
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 09:55:41 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 09:55:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18cffe9

net-libs/webkit-gtk: Stabilize 2.38.2 arm64, #879809

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index a1e81f920e00..9b1ea8f4a31c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     dc150d2a46406a7714554a3d982691155a66e088
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 09:55:35 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 09:55:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc150d2a

net-libs/webkit-gtk: Stabilize 2.38.2 x86, #879809

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index ebed392c80ad..59e4022c37ce 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     3ac15ad8731e1268e78f5ffc1df4bf38f97cf15a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 09:55:38 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 09:55:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac15ad8

net-libs/webkit-gtk: Stabilize 2.38.2 arm, #879809

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index 59e4022c37ce..a1e81f920e00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c0dabf14557c0fc251a22791418f26987783ea37
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 20:56:22 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 20:56:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0dabf14

net-libs/webkit-gtk: Stabilize 2.38.2-r410 ppc64, #885627

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
index 7c9c29144f39..c80053dc13a3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1f89633b09b014e25df37b493abf150f711961eb
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 06:42:56 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 06:44:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f89633b

net-libs/webkit-gtk: Stabilize 2.38.2-r410 ppc, #885627

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
index 1c790c938c82..0e8bf3e3868e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     5f2ad6c822d2d64da4ebcb1f90b23c9f78bbbd91
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 19:59:48 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 21:11:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f2ad6c8

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/871732
Bug: https://bugs.gentoo.org/879571
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild | 250 ---------------------------
 2 files changed, 251 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 28363b37f660..0814491ed0dd 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90bdaa6c813aa181d14c9a5636c58140ce55d5b5288a65cfbe9e363cd9d00f62de74665182ab9f856baa4b2ffcec6dba SHA512 e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
deleted file mode 100644
index 6b8011fcb778..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.7.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0:=[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.16.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_GTKDOC=$(usex gtk-doc)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_ANGLE_WEBGL=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     85e204836ae1785ca85ef73883b826b90b713d37
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 11:12:22 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 11:12:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e20483

net-libs/webkit-gtk: Stabilize 2.38.2-r410 arm, #885627

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
index 0e8bf3e3868e..fa3929026de5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     51168520f6f8da312d68ea778d8a0e0b9cca54b6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 23:56:51 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 00:19:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51168520

net-libs/webkit-gtk: Version bump to 2.38.3

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 260 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 254 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild      | 250 +++++++++++++++++++++
 4 files changed, 765 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 0814491ed0dd..8cfc16ec522f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
+DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
new file mode 100644
index 000000000000..2ce906d0bd00
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
new file mode 100644
index 000000000000..71c036b210ae
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
new file mode 100644
index 000000000000..a62b480222e4
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a37c22734ccca60e615953e32e6f301526949242
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 06:21:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 06:22:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37c2273

net-libs/webkit-gtk: Stabilize 2.38.3 amd64, #888573

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index a62b480222e4..8aac2c6d6ccf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     543753197dc4664d20916ccb482dd0be46275f15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 06:21:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 06:22:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54375319

net-libs/webkit-gtk: Stabilize 2.38.3-r500 amd64, #888573

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index 71c036b210ae..f110fff327f5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     8cbad9ec6a6f1d6c681ce38b2f8ed74c234307d1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 06:21:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 06:22:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbad9ec

net-libs/webkit-gtk: Stabilize 2.38.3-r410 amd64, #888573

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index 2ce906d0bd00..73b43b737347 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     f42a8a00df0c331710f46e0c0ec9088b9d109a7c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 22:32:59 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 22:33:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42a8a00

net-libs/webkit-gtk: Fix build failure in ClipboardGtk4.cpp

I thought this patch was included in 2.38.3, but I was mistaken.

Closes: https://bugs.gentoo.org/889588
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index f110fff327f5..cc8bc7b2643b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -156,6 +156,8 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/2.38.2-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     163bfefe7e2192fa654859b56590c23c86ff176a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 14:16:43 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 14:16:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163bfefe

net-libs/webkit-gtk: Stabilize 2.38.3 arm, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 8aac2c6d6ccf..bb05ffe2840d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     8dd7d5ad01c6e14b08b20e8f229d4f3136c74ceb
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 14:16:44 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 14:16:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd7d5ad

net-libs/webkit-gtk: Stabilize 2.38.3-r410 arm, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index 73b43b737347..d4a0392311da 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a392af562441472c00517fa528925c4d6e4dcc8c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 16:31:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 16:31:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a392af56

net-libs/webkit-gtk: Stabilize 2.38.3-r500 arm64, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index cc8bc7b2643b..8b84c0d32731 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     b6ac443595fb5fb1e4c24f3a3ebf34e0cd3347aa
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 16:31:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 16:31:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ac4435

net-libs/webkit-gtk: Stabilize 2.38.3-r410 arm64, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index d4a0392311da..35baa108b0d9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     9ea01504bc114a01d274b4662fa6b9a0b21b800c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 16:31:13 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 16:31:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea01504

net-libs/webkit-gtk: Stabilize 2.38.3 arm64, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index bb05ffe2840d..681b954b0b01 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     d0db20c8d749ac7adc44b2068307f8ac1bd33275
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 13:57:34 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 13:57:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0db20c8

net-libs/webkit-gtk: Stabilize 2.38.3-r410 x86, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index f9a15e5c49a1..8d0c26c31c6e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     9b2b7cf8744ef597029fd1a2284e1f4d80192dcf
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 13:57:34 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 13:57:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2b7cf8

net-libs/webkit-gtk: Stabilize 2.38.3-r500 x86, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index 9d50922c425e..c5568327a0a2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     706a5aadfb9fec59045e3fec5adec3e7abb2bcda
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 13:57:34 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 13:57:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706a5aad

net-libs/webkit-gtk: Stabilize 2.38.3 x86, #888573

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 01ccefdc15a8..8700c1767670 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     5148aa04a09f4457516945d0925b810f723ea23d
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Wed Feb  1 09:18:50 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 15:59:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5148aa04

net-libs/webkit-gtk: Add GStreamer runtime dependencies via optfeature

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/29373
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild      | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild      | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
index 505ab2089de9..974cff0121f5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -257,4 +257,7 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
index d114223f5eea..8e88a41adac6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
@@ -253,4 +253,7 @@ src_configure() {
 
 pkg_postinst() {
 	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index b5467b8c4810..ea261ea43953 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -247,4 +247,7 @@ src_configure() {
 
 pkg_postinst() {
 	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index ca3732bbf87f..111fb056b0e7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -258,4 +258,7 @@ src_install() {
 
 pkg_postinst() {
 	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
index 0124335db111..10d2bed4b909 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r500.ebuild
@@ -254,4 +254,7 @@ src_configure() {
 
 pkg_postinst() {
 	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 60be0c41206e..2abf370a3ffb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -248,4 +248,7 @@ src_configure() {
 
 pkg_postinst() {
 	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     f030a3630278cc3bfaaee7f6b1c00c5fd57317f2
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Fri Feb  3 14:07:12 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 16:40:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f030a363

net-libs/webkit-gtk: Version bump to 2.38.4

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29406
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild | 264 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild | 259 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild      | 254 +++++++++++++++++++++
 4 files changed, 778 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8cfc16ec522f..b75eacfedf95 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
+DIST webkitgtk-2.38.4.tar.xz 32534100 BLAKE2B 766c9d94a283605076f416fb0777a70f8dfc7ed31c5e46ae03a521b2cfcf91dc0713cfd0e527530c441c8c224e81ef663eccbf6bdb95e9ef4fa7c0aad646cc36 SHA512 1d0418d14d3852172cfa7a4c97964b547d17eba17ff5c94b124e21ae85bcebb1dda67338ceb3ba12531a01f8cfe15c21132fd16747bf17df9e726296723b9d82

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild
new file mode 100644
index 000000000000..4439d16a0952
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild
new file mode 100644
index 000000000000..172cdf123333
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild
new file mode 100644
index 000000000000..34ce19042566
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     b79e22c4696ec90b731b1473e4429266da6759ee
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Thu Feb 16 15:08:27 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 15:57:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79e22c4

net-libs/webkit-gtk: Version bump to 2.38.5

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29616
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 264 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 258 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild      | 254 +++++++++++++++++++++
 4 files changed, 777 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b75eacfedf95..27a36368dd45 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
 DIST webkitgtk-2.38.4.tar.xz 32534100 BLAKE2B 766c9d94a283605076f416fb0777a70f8dfc7ed31c5e46ae03a521b2cfcf91dc0713cfd0e527530c441c8c224e81ef663eccbf6bdb95e9ef4fa7c0aad646cc36 SHA512 1d0418d14d3852172cfa7a4c97964b547d17eba17ff5c94b124e21ae85bcebb1dda67338ceb3ba12531a01f8cfe15c21132fd16747bf17df9e726296723b9d82
+DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
new file mode 100644
index 000000000000..4439d16a0952
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
new file mode 100644
index 000000000000..82a618336e36
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
new file mode 100644
index 000000000000..34ce19042566
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     35aea4f70243ae729ae662b2e811b4836ee6f242
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 15:10:32 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 15:10:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35aea4f7

net-libs/webkit-gtk: Stabilize 2.38.3-r410 ppc, #888573

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index 111fb056b0e7..d1401f75fa0c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     77da96cd8a5f872ed0ecbf13a01fff0553f8e45c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 15:10:44 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 15:10:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77da96cd

net-libs/webkit-gtk: Stabilize 2.38.3-r410 ppc64, #888573

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
index d1401f75fa0c..832846147756 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     0844f039ef666ce973c7383b585e9d7247ccf803
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 15:10:32 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 15:10:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0844f039

net-libs/webkit-gtk: Stabilize 2.38.3 ppc, #888573

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 2abf370a3ffb..2581b96fcb2b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     48fe0c9ac251795be28863ffa42a39445c29692b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 15:10:44 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 15:10:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48fe0c9a

net-libs/webkit-gtk: Stabilize 2.38.3 ppc64, #888573

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
index 2581b96fcb2b..ed2b492313cf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     2f1279036efde4a92f96f8d94e533e71aaa60c0b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 17:01:25 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 17:32:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f127903

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/888563
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild | 263 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild | 259 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild      | 253 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild | 264 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild | 259 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild      | 254 ---------------------
 7 files changed, 1554 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 27a36368dd45..7ecd2dd83aa1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 DIST webkitgtk-2.38.3.tar.xz 33003928 BLAKE2B ae2ab019a765e91110e12277954bea9ae16fd898f854f58e665d273bcbd9ca43ee3219eea7ba0fb5716b17b8efdfeeb395c5976b38848562be95ea372b9b70bc SHA512 1e5f0d73d6b1d64faf20ab909f1765439fab230dd360dd1906962f03a24725cf9f50a375b1987b615c64fb161ab32d29d6b1d49ea75c7b2b32f495e4ad0f38ce
-DIST webkitgtk-2.38.4.tar.xz 32534100 BLAKE2B 766c9d94a283605076f416fb0777a70f8dfc7ed31c5e46ae03a521b2cfcf91dc0713cfd0e527530c441c8c224e81ef663eccbf6bdb95e9ef4fa7c0aad646cc36 SHA512 1d0418d14d3852172cfa7a4c97964b547d17eba17ff5c94b124e21ae85bcebb1dda67338ceb3ba12531a01f8cfe15c21132fd16747bf17df9e726296723b9d82
 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
deleted file mode 100644
index 974cff0121f5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
deleted file mode 100644
index 8e88a41adac6..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/${PV}-GTK-Fix-build-failure-in-ClipboardGtk4.cpp.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
deleted file mode 100644
index ea261ea43953..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild
deleted file mode 100644
index 4439d16a0952..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r410.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild
deleted file mode 100644
index 172cdf123333..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.4-r500.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=ON # wbkit2gtk-5.0
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild
deleted file mode 100644
index 34ce19042566..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.4.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     fdf60a2c342e5a097ff1e7514f5050d2e9925354
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 17:42:38 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 17:42:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf60a2c

net-libs/webkit-gtk: Stabilize 2.38.5 ppc64, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index e43c59c45717..2ef4cf597c04 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c81a3df7bb8e9708ca09523116508b60d6f5a6b3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 17:42:39 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 17:42:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81a3df7

net-libs/webkit-gtk: Stabilize 2.38.5-r500 ppc64, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index 87cf65b3a505..b43bd6147052 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     ceb1925d0b37723dc53269c8512ad5af9278fd8b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 17:42:38 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 17:42:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb1925d

net-libs/webkit-gtk: Stabilize 2.38.5-r410 ppc64, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index a91f42705e4c..3d919335303e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     dc29d0fc6d003310fe29fd83b834bdb6270c5246
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 12:03:24 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 12:03:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc29d0fc

net-libs/webkit-gtk: Stabilize 2.38.5-r410 arm, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index 3d919335303e..a769d765e65b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     645ff170cc1ada7f9895a91fc6bd1765faf10884
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 12:03:24 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 12:03:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645ff170

net-libs/webkit-gtk: Stabilize 2.38.5 arm, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index 2ef4cf597c04..37d8d8c4bf8c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     343e22df5e03d122f02333427508741bc82c20cc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 12:03:25 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 12:03:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343e22df

net-libs/webkit-gtk: Stabilize 2.38.5-r500 arm, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index b43bd6147052..da56a42d52e3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1f8891f9a6216b5fa96589b9ed02c50f67ef270c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:01:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:01:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8891f9

net-libs/webkit-gtk: Stabilize 2.38.5 ppc, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index 37d8d8c4bf8c..f4bcc13e3e66 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     7234ac565c7ff52587fc916d3085936abe2c0f1b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:01:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:01:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7234ac56

net-libs/webkit-gtk: Stabilize 2.38.5-r410 ppc, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index a769d765e65b..a9832445dcde 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     75f02c6706460d6ee1d14914116e02d35f9fb7d4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 19:01:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  1 19:01:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f02c67

net-libs/webkit-gtk: Stabilize 2.38.5-r500 ppc, #901377

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index da56a42d52e3..8f393f7f4889 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     0515195fe51c244e1b85ce0a78b9cea3a7a5c2bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  9 04:43:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  9 04:43:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0515195f

net-libs/webkit-gtk: handle more RUBY_EXECUTABLE cases

postprocess-asm invokes another Ruby script by itself, so let's just
fix the shebangs.

Closes: https://bugs.gentoo.org/771744
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 9 +++++++--
 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 9 +++++++--
 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild      | 9 +++++++--
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 9 +++++++--
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 9 +++++++--
 net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild      | 9 +++++++--
 6 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index e153b458de45..d36da49abdb9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -185,14 +185,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index 2ff1d54297c4..6e59f1ad2650 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -187,14 +187,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index a845061cb588..e2f9861228c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -183,14 +183,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
index ef3510d3d31e..80ebcb3d8538 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
@@ -174,14 +174,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
index 520cc3925b2f..4dbf4738cb41 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
@@ -175,14 +175,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
index 07c7e859bc5b..8f448fa012f1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
@@ -172,14 +172,19 @@ src_configure() {
 	# Ruby situation is a bit complicated. See bug 513888
 	local rubyimpl
 	local ruby_interpreter=""
+	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
 		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
-			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi
 	done
 	# This will rarely occur. Only a couple of corner cases could lead us to
 	# that failure. See bug 513888
-	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
 
 	# TODO: Check Web Audio support
 	# should somehow let user select between them?

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     7687fdea5a352bf4484969e2e676c32e5206457e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 03:06:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 03:06:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7687fdea

net-libs/webkit-gtk: add usedep default for virtual/rubygems

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild      | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
index d36da49abdb9..01bffa90cb34 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
@@ -187,7 +187,7 @@ src_configure() {
 	local ruby_interpreter=""
 	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
 			RUBY="$(type -P ${rubyimpl})"
 			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index 6e59f1ad2650..e57be755e686 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -189,7 +189,7 @@ src_configure() {
 	local ruby_interpreter=""
 	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
 			RUBY="$(type -P ${rubyimpl})"
 			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
index e2f9861228c6..d411b6d3c64e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
@@ -185,7 +185,7 @@ src_configure() {
 	local ruby_interpreter=""
 	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
 			RUBY="$(type -P ${rubyimpl})"
 			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
index 80ebcb3d8538..860f019f8e00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
@@ -176,7 +176,7 @@ src_configure() {
 	local ruby_interpreter=""
 	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
 			RUBY="$(type -P ${rubyimpl})"
 			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
index 4dbf4738cb41..bcec7cd21604 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
@@ -177,7 +177,7 @@ src_configure() {
 	local ruby_interpreter=""
 	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
 			RUBY="$(type -P ${rubyimpl})"
 			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
index 8f448fa012f1..0d1f3b47e453 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
@@ -174,7 +174,7 @@ src_configure() {
 	local ruby_interpreter=""
 	local RUBY
 	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
 			RUBY="$(type -P ${rubyimpl})"
 			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
 		fi

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Bernard Cafarelli]

commit:     44b66f7490b2e8a3b1996fac56845e0bc86f84ae
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 20:01:04 2023 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 20:01:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b66f74

net-libs/webkit-gtk: enable ruby32

Closes: https://bugs.gentoo.org/904396
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
index 860f019f8e00..8f2722cb04bf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
index bcec7cd21604..cddccfb4e8cd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
index 0d1f3b47e453..a68861df80f2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c778735b9bed837cdfffbf69099fccb30dd7938e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:03:46 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:03:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c778735b

net-libs/webkit-gtk: Stabilize 2.40.1 arm, #905489

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index 9e732b26cc20..c901e7a44d56 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     f02d995c72083fd895aa4e0864f458bd7cc28d11
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:19:46 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:19:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02d995c

net-libs/webkit-gtk: Stabilize 2.40.1-r410 ppc, #905579

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index 9cb3b2ce747f..266971c55e35 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a237d7b1ee39802fdc4a62958f844774e2efd139
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:19:43 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:19:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a237d7b1

net-libs/webkit-gtk: Stabilize 2.40.1-r410 x86, #905579

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index 9f944230b9ae..9cb3b2ce747f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c0bdde93232d8f4a0f814a19c7d718363fbf8ce0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:19:37 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:19:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bdde93

net-libs/webkit-gtk: Stabilize 2.40.1-r410 arm, #905579

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index 9e6da0c3793d..6d1cd0ca54ca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     884b98464f5ecdb4b6eca970105bb54471ab7b27
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 20:19:40 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue May  2 20:19:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884b9846

net-libs/webkit-gtk: Stabilize 2.40.1-r410 amd64, #905579

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index 6d1cd0ca54ca..9f944230b9ae 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     5569ea2dabba7bf048c1d7a5c45eaebb3b30694b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 03:52:30 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 03:52:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5569ea2d

net-libs/webkit-gtk: Stabilize 2.40.1-r600 ppc64, #905492

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index 234c21d774d3..bc6166466047 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     4d7e09ffe935f0c71be8bc380fa6fe702521e1ed
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 08:30:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 08:30:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7e09ff

net-libs/webkit-gtk: Stabilize 2.40.1 ppc64, #905489

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index c901e7a44d56..d38ad655f536 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     8fff3059b1de89c45c2f9c433355afff04d9a448
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 08:31:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 08:31:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fff3059

net-libs/webkit-gtk: Stabilize 2.40.1 amd64, #905489

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index d38ad655f536..2a47c1feed9b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     067786d798ced6331e39313dac492a895d451657
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 08:31:05 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed May  3 08:31:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067786d7

net-libs/webkit-gtk: Stabilize 2.40.1 arm64, #905489

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index 2a47c1feed9b..f3d4e6ca635f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     7bfeebec84bba651e2809ef9e0aa06a129c1c4c1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 15:13:45 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May  4 15:13:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bfeebec

net-libs/webkit-gtk: Stabilize 2.40.1-r600 amd64, #905492

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index bc6166466047..838805f7ce1d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a141d2c893c0d203a5a40675418fb21497dd7e6c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 15:13:48 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May  4 15:13:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a141d2c8

net-libs/webkit-gtk: Stabilize 2.40.1-r600 arm64, #905492

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index 838805f7ce1d..9efc099d075a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     cb3818cc7389b814bac3f406c0b3603ee9f05b50
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 16:31:09 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May  4 16:31:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb3818cc

net-libs/webkit-gtk: Stabilize 2.40.1 x86, #905489

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index f3d4e6ca635f..0559f91da4e4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     917ba88fdce1c7b9ec9dc7d53322f1b3fdf37bf0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May  4 17:23:35 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May  4 17:23:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917ba88f

net-libs/webkit-gtk: Stabilize 2.40.1-r600 x86, #905492

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index 9efc099d075a..e318e7b9207b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     f510730bd882a4db373f34df16db16add1a3ce43
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 06:02:29 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 06:02:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f510730b

net-libs/webkit-gtk: Stabilize 2.40.1 ppc, #905489

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index 0559f91da4e4..452c39a08d80 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     f0dea2b1f4b1d6652cc0563f2c471047f03160be
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 08:03:40 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 08:03:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0dea2b1

net-libs/webkit-gtk: Stabilize 2.40.1-r600 arm, #905492

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index 33683a2977b4..439938e3960f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     37c040cec1e96bd7a23452be1086120d089b945d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 08:03:37 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 08:03:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c040ce

net-libs/webkit-gtk: Stabilize 2.40.1-r600 ppc, #905492

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index e318e7b9207b..33683a2977b4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1422e2ac084a8a97892bd8db4b8acee257ef5df9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 08:27:41 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 08:27:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1422e2ac

net-libs/webkit-gtk: Stabilize 2.40.1-r410 arm64, #905579

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index 266971c55e35..a0f46334b27e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     86bee1489c3df428c4af82ea8b061c6747ce6586
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 08:27:44 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 08:27:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86bee148

net-libs/webkit-gtk: Stabilize 2.40.1-r410 ppc64, #905579

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index a0f46334b27e..b5dc63ab2139 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     f2e39b35f2bc73494ab8e38c67240a45a868e27f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 21:14:14 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 17 21:54:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e39b35

net-libs/webkit-gtk: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 271 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild      | 261 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 257 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 250 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild      | 247 --------------------
 6 files changed, 1287 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d1ad2019519b..4519c32e6df9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
-DIST webkitgtk-2.40.0.tar.xz 40042140 BLAKE2B 4f26d893da99c7aed18594a844b1f91e32178a1bdd236e0cdd21683ed095ab2196f37c13f749e69b22b72146b98fca2a27778948aabde336d17c4d40dcf0cdc1 SHA512 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
 DIST webkitgtk-2.40.1.tar.xz 39599544 BLAKE2B b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d SHA512 e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
deleted file mode 100644
index 01bffa90cb34..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
-	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=ON
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
deleted file mode 100644
index d411b6d3c64e..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
-
-# gstreamer with opengl/gles2 needs egl
-REQUIRED_USE="
-	gles2-only? ( egl )
-	gstreamer? ( egl )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.67.1:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	egl? ( media-libs/mesa[egl(+)] )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-#	test? (
-#		dev-python/pygobject:3[python_targets_python2_7]
-#		x11-themes/hicolor-icon-theme
-#	)
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.3-gcc-13.patch
-	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package egl EGL)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBGL=ON
-		# Supported only under ANGLE
-		-DENABLE_WEBGL2=OFF
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_GTK4=OFF
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
deleted file mode 100644
index 8f2722cb04bf..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
deleted file mode 100644
index cddccfb4e8cd..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
deleted file mode 100644
index a68861df80f2..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..11} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-	eapply "${FILESDIR}"/2.38.5-gcc-13.patch
-	eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Andreas Sturmlechner]

commit:     f27a417d83dd8409576863ddb9e531ad26145e32
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 12:17:23 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 12:09:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27a417d

net-libs/webkit-gtk: Rename USE=gnome-keyring -> keyring

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 6 +++---
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 6 +++---
 net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 6 +++---
 net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
index e57be755e686..3dcd479580aa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="5/0" # soname version of libwebkit2gtk-5.0
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+IUSE="aqua avif +egl examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
 
 # gstreamer with opengl/gles2 needs egl
 REQUIRED_USE="
@@ -58,7 +58,7 @@ RDEPEND="
 	>=dev-libs/glib-2.67.1:2
 	>=dev-libs/libxslt-1.1.7
 	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
@@ -243,7 +243,7 @@ src_configure() {
 		-DUSE_JPEGXL=OFF
 		-DUSE_LCMS=$(usex lcms)
 		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LIBSECRET=$(usex keyring)
 		-DUSE_OPENGL_OR_ES=ON
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_SOUP2=OFF

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
index b5dc63ab2139..c1e983e7035a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 # Tests do not run when built from tarballs
@@ -50,7 +50,7 @@ RDEPEND="
 	>=dev-libs/glib-2.70.0:2
 	>=dev-libs/libxslt-1.1.7
 	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
@@ -229,7 +229,7 @@ src_configure() {
 		-DUSE_JPEGXL=OFF
 		-DUSE_LCMS=$(usex lcms)
 		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LIBSECRET=$(usex keyring)
 		-DUSE_OPENGL_OR_ES=ON
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_SOUP2=OFF

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
index 439938e3960f..5f1d979eeb72 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 # Tests do not run when built from tarballs
@@ -51,7 +51,7 @@ RDEPEND="
 	>=dev-libs/glib-2.70.0:2
 	>=dev-libs/libxslt-1.1.7
 	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
@@ -230,7 +230,7 @@ src_configure() {
 		-DUSE_JPEGXL=OFF
 		-DUSE_LCMS=$(usex lcms)
 		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LIBSECRET=$(usex keyring)
 		-DUSE_OPENGL_OR_ES=ON
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_SOUP2=OFF

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
index 452c39a08d80..d7290f880277 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
-IUSE="aqua avif examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
 # Tests do not run when built from tarballs
@@ -49,7 +49,7 @@ RDEPEND="
 	>=dev-libs/glib-2.70.0:2
 	>=dev-libs/libxslt-1.1.7
 	media-libs/woff2
-	gnome-keyring? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
 	dev-libs/libtasn1:=
 	spell? ( >=app-text/enchant-0.22:2 )
@@ -227,7 +227,7 @@ src_configure() {
 		-DUSE_JPEGXL=OFF
 		-DUSE_LCMS=$(usex lcms)
 		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LIBSECRET=$(usex keyring)
 		-DUSE_OPENGL_OR_ES=ON
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_SOUP2=ON

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     f9898a3c06ff2be2f98208a59dcf037b82829757
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 14:50:36 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 18 14:50:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9898a3c

net-libs/webkit-gtk: Remove IUSE=egl description

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index cd0721b7c3f8..072951572c35 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
-    <flag name="egl">Enable EGL support</flag>
     <flag name="examples">Install the MiniBrowser example application</flag>
     <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
     <flag name="jumbo-build">Combine source files to speed up build process</flag>

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     0fb052e1ddba119d25c60fe8d91ec8298c32094c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 20:32:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 20:32:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb052e1

net-libs/webkit-gtk: Stabilize 2.40.2 arm, #907848

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
index 7375899b1ba7..ecf36ebc1763 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     cdcf2c768bd2a8a6520788735b4fb5fbf09fb8ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 20:32:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 20:32:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcf2c76

net-libs/webkit-gtk: Stabilize 2.40.2-r410 arm, #907848

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
index 8b5573fe0efd..0a0206f43621 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     df89328a6156edffb6bde3cbe2b62e5ebf1bb73d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 20:32:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun  4 20:32:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df89328a

net-libs/webkit-gtk: Stabilize 2.40.2-r600 arm, #907848

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
index 01f9f66dc047..da7c60d6349a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     2d59541241e296e0c156c8b7c3e5046b3232103e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:57:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:57:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d595412

net-libs/webkit-gtk: Stabilize 2.40.2-r410 arm64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
index a2a2a0468785..220f28f644c4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     93593d62d4db10a248f9e50c9e7198725df517a8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:57:05 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:57:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93593d62

net-libs/webkit-gtk: Stabilize 2.40.2-r410 ppc64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
index 220f28f644c4..7eed67454925 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a7aac7eefb29f939e49e4c5db93c979bd99e3f10
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:56:56 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:56:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7aac7ee

net-libs/webkit-gtk: Stabilize 2.40.2-r410 amd64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
index 0a0206f43621..a2a2a0468785 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     36d58a93017d7d62ede0e897f277ae0ba2722b0e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:56:55 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:56:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d58a93

net-libs/webkit-gtk: Stabilize 2.40.2 amd64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
index ecf36ebc1763..c26efec999eb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     bcd02df3ea440cdc8f4973840b0f9f5928626d32
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:56:56 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:56:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd02df3

net-libs/webkit-gtk: Stabilize 2.40.2-r600 amd64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
index da7c60d6349a..7222ae226e5d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     93efe557feca55d37067c19eca6f0d925e02a32d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:57:00 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:57:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93efe557

net-libs/webkit-gtk: Stabilize 2.40.2 arm64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
index c26efec999eb..1eceb692b0f6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     dad36e037caec5f63e568ace7ac8842026341833
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:57:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:57:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad36e03

net-libs/webkit-gtk: Stabilize 2.40.2-r600 arm64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
index 7222ae226e5d..88d7fb938af3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     4e63390c33bd0d16b3e2af8dc02853c3380de6ee
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:57:04 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:57:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e63390c

net-libs/webkit-gtk: Stabilize 2.40.2 ppc64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
index 1eceb692b0f6..8d407c2de659 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     56fa67133f6815bf35dd10de1c386434d9c68dba
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 16:57:05 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 16:57:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56fa6713

net-libs/webkit-gtk: Stabilize 2.40.2-r600 ppc64, #907848

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
index 88d7fb938af3..c3d6fc150158 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[WANG Xuerui]

commit:     ea09fdc1aa8bbbe62ba039c8bb325cf84d04cb87
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 02:36:25 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 02:43:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea09fdc1

net-libs/webkit-gtk: keyword 2.40.2 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
index 8d407c2de659..a7bc67cdb5e0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[WANG Xuerui]

commit:     d378652736f8fab61fd0b22f40b2a893a544d267
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 07:56:17 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 02:43:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3786527

net-libs/webkit-gtk: keyword 2.40.2-r600 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
index c3d6fc150158..5d85b604bbdf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[WANG Xuerui]

commit:     76258f52af80094df3f16e947ebd9f9edaabfec7
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 07:56:25 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 02:43:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76258f52

net-libs/webkit-gtk: keyword 2.40.2-r410 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
index 7eed67454925..615d7ada0f6c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     236963f09df29c899edb9da02c7d5cf7b085821a
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Sun Jul  2 02:09:20 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 13:59:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236963f0

net-libs/webkit-gtk: Version bump to 2.40.3

Bug: https://bugs.gentoo.org/909663
Closes: https://github.com/gentoo/gentoo/pull/31705
Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 258 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 251 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild      | 248 +++++++++++++++++++++
 4 files changed, 758 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index f54e4ecb50e0..8c2084f61be6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.40.1.tar.xz 39599544 BLAKE2B b50c983eafdb215e62e1509873691bc3f932c8b5daf0ceeaefc041d3bc6c5ff804f25af5f761837a3f37df07c1c598f5984e40b116e70a3523d508d13594dc4d SHA512 e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
 DIST webkitgtk-2.40.2.tar.xz 40065104 BLAKE2B 177ac87de1c17768c50761f4146f3c8dc218abacb9de0c811ec4acf2ea7117cd62e256cb09345c55ee8da7479c8df3faf3c1b09d0876be33dd740bf6541af27d SHA512 2fea73faffe171845f3710995bb27eb7350aa9ba7b513e7f0fc163c09fc63d73112a55dbc010af67e422c59baa9bfc85018f470a0255e43eb17aae465946eef7
+DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
new file mode 100644
index 000000000000..d3232f2f6a1d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
new file mode 100644
index 000000000000..6789c7e570cf
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
new file mode 100644
index 000000000000..429415d303ca
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{9..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[WANG Xuerui]

commit:     cb4fd2ea2e4f198b90d57f7164485b28fb641390
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 08:18:12 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 08:18:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4fd2ea

net-libs/webkit-gtk: keyword 2.40.3-r410 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index d3232f2f6a1d..278eda09c2b0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[WANG Xuerui]

commit:     b9f33491cea08fcbd194f3bfebc1f769059906a5
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 08:18:14 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 08:18:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f33491

net-libs/webkit-gtk: keyword 2.40.3-r600 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index 6789c7e570cf..2304283a8fcf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[WANG Xuerui]

commit:     98e96713366656d6af956290f64b5769fbe0a147
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  7 08:18:09 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri Jul  7 08:18:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e96713

net-libs/webkit-gtk: keyword 2.40.3 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index 429415d303ca..30dc4de1563d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     8888870dfc7a367d0e9698021a88aea477968d94
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:19 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8888870d

net-libs/webkit-gtk: Stabilize 2.40.3-r600 arm64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index 3b387f471270..deec6ac31ea5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     5908ef6f2d3471da48a1288596a1a881911f60bc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:18 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5908ef6f

net-libs/webkit-gtk: Stabilize 2.40.3 arm64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index c86e1532362c..18f64dcc8037 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     0049a96bb5873f1a86ea90b1a8e174039883fc52
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0049a96b

net-libs/webkit-gtk: Stabilize 2.40.3-r410 arm, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index 278eda09c2b0..d406e7d114e9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     cab9d13f813317f84056f6144e823729f55593e0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab9d13f

net-libs/webkit-gtk: Stabilize 2.40.3 arm, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index 30dc4de1563d..c86e1532362c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     515ecfb63c7c0df123212f420703e5c6f23d9083
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:18 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515ecfb6

net-libs/webkit-gtk: Stabilize 2.40.3-r410 arm64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index d406e7d114e9..c06456057331 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     d8b10ac08652636b16c18989e99fc7b616b0fdac
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:15 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b10ac0

net-libs/webkit-gtk: Stabilize 2.40.3-r600 arm, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index 2304283a8fcf..3b387f471270 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     af7f3ec8f2dd2d76b280948501bb9fd07248334c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7f3ec8

net-libs/webkit-gtk: Stabilize 2.40.3 x86, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index ba3044ba8c0d..4c810f12a938 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     b11f59991a1447d22e5582b5ad94cbf2ae6012d8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:27 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11f5999

net-libs/webkit-gtk: Stabilize 2.40.3-r410 x86, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index b692cd580973..e0dffe95cf93 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     eb2b5c23202108a6a2bce80a4121c76b73bca515
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:23 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2b5c23

net-libs/webkit-gtk: Stabilize 2.40.3 amd64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index 18f64dcc8037..ba3044ba8c0d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     b4b9ccd73c984d25aa9b5ab6ef84779b5912db39
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:23 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b9ccd7

net-libs/webkit-gtk: Stabilize 2.40.3-r600 amd64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index deec6ac31ea5..dd355c2e78c9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a3e64c961c020ee0af0efdd01eb34dc753ca1f64
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:23 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e64c96

net-libs/webkit-gtk: Stabilize 2.40.3-r410 amd64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index c06456057331..b692cd580973 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     5120f3fe624bbeb1d09177ef09bbac1eb251f595
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:45:27 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:45:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5120f3fe

net-libs/webkit-gtk: Stabilize 2.40.3-r600 x86, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index dd355c2e78c9..3c35bdcbb361 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1f679c02fd90fc6f2f41440c4a65e3512e9d929d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:46:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:46:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f679c02

net-libs/webkit-gtk: Stabilize 2.40.3-r410 ppc64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index e0dffe95cf93..be34244c7ea6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     6a4875219b7a0e250fb29bf36e5e093fa37413e3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:46:15 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:46:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a487521

net-libs/webkit-gtk: Stabilize 2.40.3-r600 ppc64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index 3c35bdcbb361..de8871f68bbc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     def8388c6734d1aaa92347072ab20717b6deb389
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:46:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:46:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def8388c

net-libs/webkit-gtk: Stabilize 2.40.3 ppc64, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index 4c810f12a938..7f6144c0c1a2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     f077ca33fc45e034de92318a4ff50fe611833dbd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 18:35:54 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 18:35:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f077ca33

net-libs/webkit-gtk: Stabilize 2.40.3-r410 ppc, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
index be34244c7ea6..8cdbbbfa51ea 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     0f91928383cfa324f83fcf90406f86823f9e9043
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 18:35:54 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 18:35:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f919283

net-libs/webkit-gtk: Stabilize 2.40.3-r600 ppc, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
index de8871f68bbc..0122c035d957 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1bfef035ce64befca3f6e452f9f6c72b01ab6ce0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 18:35:53 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 18:35:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfef035

net-libs/webkit-gtk: Stabilize 2.40.3 ppc, #910064

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
index 7f6144c0c1a2..ca15a3860c11 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     83bdf74c8b4b1bcacea3d6661e68cf90dc913fc9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 22:52:56 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 22:55:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83bdf74c

net-libs/webkit-gtk: Version bump to 2.40.4

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 258 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 251 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild      | 248 +++++++++++++++++++++
 4 files changed, 758 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 31925947bbe2..5d98b62f8209 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e
+DIST webkitgtk-2.40.4.tar.xz 40065340 BLAKE2B a6bab5ede61d85d93c61f70222156123ebbe8d352d00004e9aa317c3902745530676f40c9caef93485d2e0c227882554623dd4bee6343360bb914c4ccaefb8ad SHA512 3b9118f81d463d4d19d217abd0c4e109a159785bc5effe93188f62bca71f2d3124b232c969710ed958c58519b62cf2753bbdfbd2396e6200cc623a3343cdfc44

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
new file mode 100644
index 000000000000..46521ce3874e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
new file mode 100644
index 000000000000..4e2e199e53c8
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
new file mode 100644
index 000000000000..0af88789a7fa
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     341e7258651d7275cefc1573ed6c46c3259493c8
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:58:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:58:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341e7258

net-libs/webkit-gtk: Stabilize 2.40.4 x86, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
index 0af88789a7fa..bc9c0a496f09 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     d7a15d7c480d5c4ebd1cafc077785bab03bb9a00
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:58:04 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:58:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a15d7c

net-libs/webkit-gtk: Stabilize 2.40.4-r600 x86, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index 4e2e199e53c8..463cf83c529a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     7e0c4c387b34f1f52d5b123bd674123b0c7d8a28
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:58:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:58:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0c4c38

net-libs/webkit-gtk: Stabilize 2.40.4-r410 x86, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
index 46521ce3874e..e7bacab11df0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     219223b65662f4eceae3297f2c947ff609eea807
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:59:00 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:59:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219223b6

net-libs/webkit-gtk: Stabilize 2.40.4-r410 arm64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
index 67fb78db5fca..33016e472391 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     0820b825132025a59379eb18ea851b195339775e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:58:55 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:58:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0820b825

net-libs/webkit-gtk: Stabilize 2.40.4 amd64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
index bc9c0a496f09..994cb7c007db 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     3ea266457839b5dd385c0207f52a60af872edff0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:59:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:59:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea26645

net-libs/webkit-gtk: Stabilize 2.40.4-r600 arm64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index bde916b8538c..7fbe055fc29e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     3735a16a63390b63476bfc1d90740c86aa2c9614
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:59:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:59:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3735a16a

net-libs/webkit-gtk: Stabilize 2.40.4 arm, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
index dbbc97f3f7c6..bb2a2433778c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     5d6713b8bc4d10a20802fdc8c3f688d3de4894a6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:59:00 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:59:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6713b8

net-libs/webkit-gtk: Stabilize 2.40.4 arm64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
index 994cb7c007db..dbbc97f3f7c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     7f62aa718e669e1f29e62e09b16e791158f31d73
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:58:55 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:58:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f62aa71

net-libs/webkit-gtk: Stabilize 2.40.4-r410 amd64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
index e7bacab11df0..67fb78db5fca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     0412d1d26d9fa1d8895287a995d844cbda1a18ee
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:58:56 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:58:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0412d1d2

net-libs/webkit-gtk: Stabilize 2.40.4-r600 amd64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index 463cf83c529a..bde916b8538c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     98b0095c5b4e065af863f76ccf6c1f8ff1fda863
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:59:04 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:59:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b0095c

net-libs/webkit-gtk: Stabilize 2.40.4-r600 arm, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index 7fbe055fc29e..50f800279349 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     86cde6b03a03eb5477a5809b1f875396613c60f2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 15:59:04 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 15:59:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cde6b0

net-libs/webkit-gtk: Stabilize 2.40.4-r410 arm, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
index 33016e472391..b83917ff2f05 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     fb5ea79ae87401e06537f0b1ac9f8b50ba8136b1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 16:00:27 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 16:00:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5ea79a

net-libs/webkit-gtk: Stabilize 2.40.4 ppc64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
index bb2a2433778c..34d4ee875400 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     291f25c2a6c0a5e11761633e92d3cfaba7c3763e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 16:00:28 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 16:00:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291f25c2

net-libs/webkit-gtk: Stabilize 2.40.4-r410 ppc64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
index b83917ff2f05..c2b4016bcbb3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     df4308c70f6c95954dae0fd616d3eb100afd1d88
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 16:00:28 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 16:00:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4308c7

net-libs/webkit-gtk: Stabilize 2.40.4-r600 ppc64, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index 50f800279349..fc291cf0a0c7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     733da6eb9a629a3b6e70f9078898da2e83147e53
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Wed Aug  2 16:08:50 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 17:10:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=733da6eb

net-libs/webkit-gtk: Version bump to 2.40.5

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32143
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild | 258 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild | 251 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild      | 248 +++++++++++++++++++++
 4 files changed, 758 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 5d98b62f8209..68ef3b7d9569 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e
 DIST webkitgtk-2.40.4.tar.xz 40065340 BLAKE2B a6bab5ede61d85d93c61f70222156123ebbe8d352d00004e9aa317c3902745530676f40c9caef93485d2e0c227882554623dd4bee6343360bb914c4ccaefb8ad SHA512 3b9118f81d463d4d19d217abd0c4e109a159785bc5effe93188f62bca71f2d3124b232c969710ed958c58519b62cf2753bbdfbd2396e6200cc623a3343cdfc44
+DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
new file mode 100644
index 000000000000..46521ce3874e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
new file mode 100644
index 000000000000..4e2e199e53c8
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
new file mode 100644
index 000000000000..0af88789a7fa
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     dad883b2bdc6f668b95f161012853f3b4942ef09
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 03:49:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 03:49:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad883b2

net-libs/webkit-gtk: Stabilize 2.40.4 ppc, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
index 34d4ee875400..7e51344c5ba7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     9beaaf9c45bf2d897b7ba8ccc87d49bef66464fe
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 03:49:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 03:49:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9beaaf9c

net-libs/webkit-gtk: Stabilize 2.40.4-r410 ppc, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
index c2b4016bcbb3..2f2ecba14f86 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     736365e26f125cf193adb290f8c1400d6fe34884
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 03:49:02 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 03:49:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736365e2

net-libs/webkit-gtk: Stabilize 2.40.4-r600 ppc, #910698

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index fc291cf0a0c7..5e93ae6656c9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     6976a21b771d32f814890ddfd376c21afd2edb2f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 04:16:53 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 04:17:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6976a21b

net-libs/webkit-gtk: Drop old versions

Bug: https://bugs.gentoo.org/910656
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild | 258 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild | 251 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild      | 248 ---------------------
 4 files changed, 758 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 68ef3b7d9569..ae57415acf0d 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
-DIST webkitgtk-2.40.3.tar.xz 40064488 BLAKE2B b88b3d9bb6729de8a1b667575acbc9e42c39a222c191ef666f1a58fc593047de1530c597fc2cbc657da845f6262bd4014995fea0cd9776ef60b931769a89594d SHA512 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e
 DIST webkitgtk-2.40.4.tar.xz 40065340 BLAKE2B a6bab5ede61d85d93c61f70222156123ebbe8d352d00004e9aa317c3902745530676f40c9caef93485d2e0c227882554623dd4bee6343360bb914c4ccaefb8ad SHA512 3b9118f81d463d4d19d217abd0c4e109a159785bc5effe93188f62bca71f2d3124b232c969710ed958c58519b62cf2753bbdfbd2396e6200cc623a3343cdfc44
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
deleted file mode 100644
index 8cdbbbfa51ea..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r410.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
deleted file mode 100644
index 0122c035d957..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3-r600.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
deleted file mode 100644
index ca15a3860c11..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{9..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     a9d1f2144bc5b266fd0561f102a536e28f2a68cd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 13:52:03 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 14:03:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d1f214

net-libs/webkit-gtk: Depend on gui-libs/gtk[introspection?]

Closes: https://bugs.gentoo.org/911864
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
index 5e93ae6656c9..acd4f4dc99c5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	>=media-libs/freetype-2.9.0:2
 	>=dev-libs/libgcrypt-1.7.0:0=
 	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
+	gui-libs/gtk:4[introspection?]
 	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
 	>=dev-libs/icu-61.2:=
 	media-libs/libjpeg-turbo:0=

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index eebf464f2fd0..c233cd58563d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	>=media-libs/freetype-2.9.0:2
 	>=dev-libs/libgcrypt-1.7.0:0=
 	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4
+	gui-libs/gtk:4[introspection?]
 	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
 	>=dev-libs/icu-61.2:=
 	media-libs/libjpeg-turbo:0=

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     b28864a736e11b7b584e4c00f52dc95428d3bb5c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 18:00:31 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 18:00:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28864a7

net-libs/webkit-gtk: Stabilize 2.40.5 arm, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
index 5a46078b6f07..cce271bb392f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     131f91527528d984aa18dbb5d0e04eb128bc8d71
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 18:00:32 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 18:00:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131f9152

net-libs/webkit-gtk: Stabilize 2.40.5-r410 arm, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
index 7a76adf33708..b5f7e494b3ff 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     e13b0722f748536c654e2c64a4ac30109c029ed3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 18:00:32 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 18:00:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13b0722

net-libs/webkit-gtk: Stabilize 2.40.5-r600 arm, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index 16dd99607205..84ce0c88a0ba 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     86ca460f98e41686eace789f500bb4b9ed343903
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 07:50:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 07:57:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ca460f

net-libs/webkit-gtk: Stabilize 2.40.5-r410 x86, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
index 88f1d61eca47..6c51653a57cf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     b0e5581f158ab494c94e662c33ca2a5f6f2e27df
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 07:50:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 07:57:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e5581f

net-libs/webkit-gtk: Stabilize 2.40.5 x86, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
index 827e3c306908..092df5fb7652 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     e0a8fcaf9732350b876cc88c838226fd20b7b453
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 07:50:27 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 07:57:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a8fcaf

net-libs/webkit-gtk: Stabilize 2.40.5-r600 x86, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index 2473a43de871..b2e4e3332e1e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     77e4af125b06a9d4d78d929560f8606d767accbe
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 16:05:39 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 16:05:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e4af12

net-libs/webkit-gtk: Stabilize 2.40.5-r600 ppc, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index b2e4e3332e1e..8006fa8fabb6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     dba55b538017cf0cc116df3ccaebcc3e70b29a72
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 16:05:52 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 16:05:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba55b53

net-libs/webkit-gtk: Stabilize 2.40.5 ppc64, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
index 5770855e83a3..4cb6d68cca08 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c66f62b3d14d98fdc21a1e1b3a3c610eb470be32
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 16:05:53 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 16:05:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66f62b3

net-libs/webkit-gtk: Stabilize 2.40.5-r410 ppc64, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
index fd089d93f5ab..80eb03f03252 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     196386b074f88fc3c39cabc173d9dedad69c2553
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 16:05:53 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 16:05:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196386b0

net-libs/webkit-gtk: Stabilize 2.40.5-r600 ppc64, #913218

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
index 8006fa8fabb6..42ebf467739e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     febfd195a1dfb563c63425bc7409bd8509958d44
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  5 19:06:56 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 20:28:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febfd195

net-libs/webkit-gtk: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild | 258 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild | 251 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild      | 248 ---------------------
 4 files changed, 758 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ae57415acf0d..328f43876313 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1 @@
-DIST webkitgtk-2.40.4.tar.xz 40065340 BLAKE2B a6bab5ede61d85d93c61f70222156123ebbe8d352d00004e9aa317c3902745530676f40c9caef93485d2e0c227882554623dd4bee6343360bb914c4ccaefb8ad SHA512 3b9118f81d463d4d19d217abd0c4e109a159785bc5effe93188f62bca71f2d3124b232c969710ed958c58519b62cf2753bbdfbd2396e6200cc623a3343cdfc44
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
deleted file mode 100644
index 2f2ecba14f86..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r410.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
deleted file mode 100644
index acd4f4dc99c5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4-r600.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	gui-libs/gtk:4[introspection?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
deleted file mode 100644
index 7e51344c5ba7..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.4.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
-		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		$(cmake_use_find_package gles2-only OpenGLES2)
-		$(cmake_use_find_package !gles2-only OpenGL)
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_GLES2=$(usex gles2-only)
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=OFF
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     0601fd2f44133f0a4b80e28fcfc1aeb9ec255dda
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 15:22:29 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 16:06:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0601fd2f

net-libs/webkit-gtk: Version bump to 2.42.0-r600

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32810
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild | 252 ++++++++++++++++++++++
 1 file changed, 252 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
new file mode 100644
index 000000000000..c3f8c3afb610
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     74ce7f3756ece3d5ea4fab6568527b9d2b2458f6
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 15:22:15 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 16:06:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ce7f37

net-libs/webkit-gtk: Version bump to 2.42.0-r410

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild | 259 ++++++++++++++++++++++
 1 file changed, 259 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
new file mode 100644
index 000000000000..007034b448c5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Matt Turner]

commit:     83ed0625083455944e2f60bf065643018de2c894
Author:     Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 15:21:57 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 16:06:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ed0625

net-libs/webkit-gtk: Version bump to 2.42.0

Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                 |   1 +
 net-libs/webkit-gtk/metadata.xml             |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild | 249 +++++++++++++++++++++++++++
 3 files changed, 251 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 328f43876313..92292d279f9b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1 +1,2 @@
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
+DIST webkitgtk-2.42.0.tar.xz 40917832 BLAKE2B afaaef8482fe81645eee55be86a80fb51eff83dc000ac0dc5981d41810b5c72c59428d8e92a02c04718c0367ac19689501c81764f9603b767d7271ad9cd66075 SHA512 f71627182707f4ab34483a16b74d1519d7234833151ced818e54749f8ecb1f2956cc5d76e09957d07b727155c023e7b75426ad38ee955928fcac9e68d6304e2b

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 072951572c35..5c693eac94bb 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -9,6 +9,7 @@
     <flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
     <flag name="examples">Install the MiniBrowser example application</flag>
     <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
+    <flag name="jpegxl">Enable support for JPEG-XL images</flag>
     <flag name="jumbo-build">Combine source files to speed up build process</flag>
   </use>
   <upstream>

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
new file mode 100644
index 000000000000..ff1b87b91e12
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     3ffde952ceb777dc9ae00d2b5c6c7270aa51755d
Author:     Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Sun Oct  1 21:16:06 2023 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 20:39:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffde952

net-libs/webkit-gtk: Version bump to 2.42.1

Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33153
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild | 259 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild | 252 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild      | 249 +++++++++++++++++++++
 4 files changed, 761 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 92292d279f9b..e41627b26e37 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
 DIST webkitgtk-2.42.0.tar.xz 40917832 BLAKE2B afaaef8482fe81645eee55be86a80fb51eff83dc000ac0dc5981d41810b5c72c59428d8e92a02c04718c0367ac19689501c81764f9603b767d7271ad9cd66075 SHA512 f71627182707f4ab34483a16b74d1519d7234833151ced818e54749f8ecb1f2956cc5d76e09957d07b727155c023e7b75426ad38ee955928fcac9e68d6304e2b
+DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217b62d9579cf9b9408cb3e4fa1a8405c5c2608edf0960baed62aafa766e6cdbe2f0c07e8fb728d86c111f12d5a816492 SHA512 c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
new file mode 100644
index 000000000000..007034b448c5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
new file mode 100644
index 000000000000..c3f8c3afb610
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
new file mode 100644
index 000000000000..ff1b87b91e12
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     c270b5850091818ce141a72cac19f672f2b884f0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 20:18:52 2023 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 20:18:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c270b585

net-libs/webkit-gtk: drop 2.42.0, 2.42.0-r410, 2.42.0-r600

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 -
 net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild | 259 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild | 252 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild      | 249 ---------------------
 4 files changed, 761 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e41627b26e37..f61940662de9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,2 @@
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
-DIST webkitgtk-2.42.0.tar.xz 40917832 BLAKE2B afaaef8482fe81645eee55be86a80fb51eff83dc000ac0dc5981d41810b5c72c59428d8e92a02c04718c0367ac19689501c81764f9603b767d7271ad9cd66075 SHA512 f71627182707f4ab34483a16b74d1519d7234833151ced818e54749f8ecb1f2956cc5d76e09957d07b727155c023e7b75426ad38ee955928fcac9e68d6304e2b
 DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217b62d9579cf9b9408cb3e4fa1a8405c5c2608edf0960baed62aafa766e6cdbe2f0c07e8fb728d86c111f12d5a816492 SHA512 c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
deleted file mode 100644
index 007034b448c5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r410.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
deleted file mode 100644
index c3f8c3afb610..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.0-r600.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=gui-libs/gtk-4.4.0:4[introspection?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
deleted file mode 100644
index ff1b87b91e12..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michał Górny]

commit:     8558e13eae783675662fff85d9d5dc04cd103ebe
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 12:50:30 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 15:18:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8558e13e

net-libs/webkit-gtk: Remove redundant local flag descs

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-libs/webkit-gtk/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 5c693eac94bb..a370a1712c2f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -6,10 +6,8 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
-    <flag name="avif">Enable support for AVIF images via <pkg>media-libs/libavif</pkg></flag>
     <flag name="examples">Install the MiniBrowser example application</flag>
     <flag name="gamepad">Enable gamepad input support via <pkg>dev-libs/libmanette</pkg></flag>
-    <flag name="jpegxl">Enable support for JPEG-XL images</flag>
     <flag name="jumbo-build">Combine source files to speed up build process</flag>
   </use>
   <upstream>

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     6c65a63f3ecc7b06975d9c035673bf909ace4bb9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 10:43:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 10:43:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c65a63f

net-libs/webkit-gtk: Stabilize 2.42.1 arm64, #915977

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index 86bbd5c5de8a..e0402ecea8d4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     079ff10874306699ef8ca483ad985bdeafa4f0e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 10:43:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 10:43:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079ff108

net-libs/webkit-gtk: Stabilize 2.42.1-r600 arm64, #915977

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index 750b51413093..721d58831b00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     f0826f6342caa4117f02c9c9ee1481061c821c9b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 10:43:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 10:43:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0826f63

net-libs/webkit-gtk: Stabilize 2.42.1-r410 arm64, #915977

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index 19c7f97e3817..b37f98687e9c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     fd218bdc06ac079c011d8bdccb66cf213db25d53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 12:31:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:31:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd218bdc

net-libs/webkit-gtk: Stabilize 2.42.1 amd64, #915977

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index e0402ecea8d4..fcdc8ba20a52 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     9c83aa724e2f7fb13f26208b20396eacf405387f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 12:31:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:31:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c83aa72

net-libs/webkit-gtk: Stabilize 2.42.1-r600 amd64, #915977

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index 721d58831b00..57f799350171 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a931b48ecbb697c362ff708fb0650a5906d6ac38
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 12:31:13 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:31:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a931b48e

net-libs/webkit-gtk: Stabilize 2.42.1-r410 amd64, #915977

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index b37f98687e9c..83b897fc606e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c9419f585c0c2cb195fc3540dc9c610bdd9d9f5d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 09:36:29 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 09:36:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9419f58

net-libs/webkit-gtk: Stabilize 2.42.1 arm, #915977

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index fcdc8ba20a52..bf663a9ef933 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     47eb1345f258044d980ed9f1d25ef8d2fe00b913
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 09:36:29 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 09:36:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47eb1345

net-libs/webkit-gtk: Stabilize 2.42.1-r410 arm, #915977

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index 83b897fc606e..693d5fa4f7fa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     3d7e1304cab3afa11c8fe593514efe25828b6792
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 09:36:30 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 09:36:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7e1304

net-libs/webkit-gtk: Stabilize 2.42.1-r600 arm, #915977

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index 57f799350171..270c8e388dd2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     01f0f0d9901d8d10804bba662f7f1537e9b16e32
Author:     Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Sat Nov 11 01:16:52 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 16:47:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f0f0d9

net-libs/webkit-gtk: Version bump to 2.42.2

Closes: https://github.com/gentoo/gentoo/pull/33762
Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.42.2-r410.ebuild | 262 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.2-r600.ebuild | 255 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.2.ebuild      | 252 +++++++++++++++++++++
 4 files changed, 770 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index f61940662de9..91959c5fc69a 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
 DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217b62d9579cf9b9408cb3e4fa1a8405c5c2608edf0960baed62aafa766e6cdbe2f0c07e8fb728d86c111f12d5a816492 SHA512 c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c
+DIST webkitgtk-2.42.2.tar.xz 32020280 BLAKE2B 488b820503362c5cac28f4b9607555d60a27003343f6d54c233bb466f66e5313aab68d5b65ccac8eff32c4c4f694a227b96d1148105b7b8ee333b24d3f2b2b0b SHA512 4cbd057c55c96bdc6b4f8ece89cb9803e8503146de62f74427cdcea8de5f2a644fa213160a02dfbb0df1529fbf84fd4cd73ba3953466d11d7b0b9cad04c3214f

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.2-r410.ebuild
new file mode 100644
index 000000000000..19c7f97e3817
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.2-r410.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.2-r600.ebuild
new file mode 100644
index 000000000000..750b51413093
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.2-r600.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.2.ebuild
new file mode 100644
index 000000000000..86bbd5c5de8a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     c8c55c4a144a719cece728ebf9293ba3ff029657
Author:     Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Tue Dec  5 23:37:16 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 13:26:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c55c4a

net-libs/webkit-gtk: Version bump to 2.42.3

Bug: https://bugs.gentoo.org/919290
Closes: https://github.com/gentoo/gentoo/pull/34137
Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 262 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 255 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild      | 252 +++++++++++++++++++++
 4 files changed, 770 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 91959c5fc69a..c1cd58b022d7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4fef92a4699b09b87c38e81d56e0da7b5fb20d9e0dbbc32016025e60ca2c6e44d9032c300bfbdc931f4097d5608bb62f SHA512 a8c9f04e971e0464ea39a5d1dacb6251a08c5a851def21bfeb990beebb82d1a2a97e7cfc65ae3ed1f6fe76ac6f6463b1f64a6a2a341d266c381710dd84c4082a
 DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217b62d9579cf9b9408cb3e4fa1a8405c5c2608edf0960baed62aafa766e6cdbe2f0c07e8fb728d86c111f12d5a816492 SHA512 c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c
 DIST webkitgtk-2.42.2.tar.xz 32020280 BLAKE2B 488b820503362c5cac28f4b9607555d60a27003343f6d54c233bb466f66e5313aab68d5b65ccac8eff32c4c4f694a227b96d1148105b7b8ee333b24d3f2b2b0b SHA512 4cbd057c55c96bdc6b4f8ece89cb9803e8503146de62f74427cdcea8de5f2a644fa213160a02dfbb0df1529fbf84fd4cd73ba3953466d11d7b0b9cad04c3214f
+DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
new file mode 100644
index 000000000000..19c7f97e3817
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
new file mode 100644
index 000000000000..750b51413093
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
new file mode 100644
index 000000000000..86bbd5c5de8a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Viorel Munteanu]

commit:     85276529d0acb8ce6eddc5f109b784727e3ef4ef
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 12 05:34:17 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 06:26:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85276529

net-libs/webkit-gtk: Stabilize 2.42.1 ppc64, #915977

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index bf663a9ef933..5375e0c646b1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Viorel Munteanu]

commit:     b0a1ce180552f6f5e176b8da8c7221ca5cdfd59d
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 12 05:34:18 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 06:26:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a1ce18

net-libs/webkit-gtk: Stabilize 2.42.1-r410 ppc64, #915977

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index 693d5fa4f7fa..7a8bf7a7bb49 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Viorel Munteanu]

commit:     82228975fe36f705b174e720706c1ea25890eaa9
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 12 05:34:18 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 06:26:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82228975

net-libs/webkit-gtk: Stabilize 2.42.1-r600 ppc64, #915977

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index 270c8e388dd2..d02e7aaef4d7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     6767c81b8f0b2a80fd8eaef90c7071dadcc87376
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 10:21:08 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 10:21:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6767c81b

net-libs/webkit-gtk: Stabilize 2.42.3 arm64, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index 86bbd5c5de8a..e0402ecea8d4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1547fe6e86d24f3caaa207c612c80d2423139a62
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 10:21:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 10:21:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1547fe6e

net-libs/webkit-gtk: Stabilize 2.42.3 amd64, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index e0402ecea8d4..fcdc8ba20a52 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     6787cd981067b5819024e5770b98f3654c62a8b0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 10:21:08 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 10:21:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6787cd98

net-libs/webkit-gtk: Stabilize 2.42.3-r410 arm64, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index 19c7f97e3817..b37f98687e9c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     62d4cfc84d120b002b4f600dab362e8849b04402
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 10:21:09 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 10:21:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d4cfc8

net-libs/webkit-gtk: Stabilize 2.42.3-r600 arm64, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index 750b51413093..721d58831b00 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     af1737f934d7d232305f8f2b86f1d769a980d168
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 10:21:14 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 10:21:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1737f9

net-libs/webkit-gtk: Stabilize 2.42.3-r410 amd64, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index b37f98687e9c..83b897fc606e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     ba4feb39d3486caad27a4c267dd50d4cabea0c6a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 10:21:15 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 10:21:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4feb39

net-libs/webkit-gtk: Stabilize 2.42.3-r600 amd64, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index 721d58831b00..57f799350171 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     930b3bcbc492517daa64c229df0ae4f173c4f6b9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 11:30:25 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 11:30:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930b3bcb

net-libs/webkit-gtk: Stabilize 2.42.3 arm, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index fcdc8ba20a52..bf663a9ef933 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     4ee3a84c813b0d36c2477a8f059673d7ff99a4b1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 11:30:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 11:30:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee3a84c

net-libs/webkit-gtk: Stabilize 2.42.3-r600 arm, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index 57f799350171..270c8e388dd2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     5c087952288fd307c6e7347051092083afcd65cb
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 11:30:26 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 11:30:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c087952

net-libs/webkit-gtk: Stabilize 2.42.3-r410 arm, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index 83b897fc606e..693d5fa4f7fa 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a437afd2ba43aac6ab6eaa47fe8f9ea25cf73b3b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 04:44:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 04:45:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a437afd2

net-libs/webkit-gtk: Stabilize 2.42.3 ppc64, #919979

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index bf663a9ef933..5375e0c646b1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     2bb8c2c7ba863434cf45bf84976e9a5738d928b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 04:44:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 04:45:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb8c2c7

net-libs/webkit-gtk: Stabilize 2.42.3-r600 ppc64, #919979

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index 270c8e388dd2..d02e7aaef4d7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     420f1ca00871fbf3c8b34340eec6c57fdbb1c406
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 04:44:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 04:45:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420f1ca0

net-libs/webkit-gtk: Stabilize 2.42.3-r410 ppc64, #919979

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index 693d5fa4f7fa..7a8bf7a7bb49 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     d185d84eed865daeedac97190fc899f51d97ea0f
Author:     Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Fri Dec 15 19:56:22 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 18:32:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d185d84e

net-libs/webkit-gtk: Version bump to 2.42.4

Closes: https://github.com/gentoo/gentoo/pull/34299
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 262 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 255 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild      | 252 +++++++++++++++++++++
 4 files changed, 770 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c1cd58b022d7..6ef530abe4b1 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,3 +2,4 @@ DIST webkitgtk-2.40.5.tar.xz 40066432 BLAKE2B 67b8f429af8b746a256ca36c335c33ab4f
 DIST webkitgtk-2.42.1.tar.xz 38011772 BLAKE2B c6453cf2d15661507df66c5478e7675217b62d9579cf9b9408cb3e4fa1a8405c5c2608edf0960baed62aafa766e6cdbe2f0c07e8fb728d86c111f12d5a816492 SHA512 c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c
 DIST webkitgtk-2.42.2.tar.xz 32020280 BLAKE2B 488b820503362c5cac28f4b9607555d60a27003343f6d54c233bb466f66e5313aab68d5b65ccac8eff32c4c4f694a227b96d1148105b7b8ee333b24d3f2b2b0b SHA512 4cbd057c55c96bdc6b4f8ece89cb9803e8503146de62f74427cdcea8de5f2a644fa213160a02dfbb0df1529fbf84fd4cd73ba3953466d11d7b0b9cad04c3214f
 DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839
+DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
new file mode 100644
index 000000000000..19c7f97e3817
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
new file mode 100644
index 000000000000..750b51413093
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
new file mode 100644
index 000000000000..86bbd5c5de8a
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     6b74ec719c264479fdc6a6f8e33b214a207743d7
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 19:55:46 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 19:55:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b74ec71

net-libs/webkit-gtk: Stabilize 2.42.3-r600 ppc, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index d02e7aaef4d7..d10304f50208 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     bacf5bd85b0c2fafa1c59a5d543006d79418853b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 19:55:50 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 19:55:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacf5bd8

net-libs/webkit-gtk: Stabilize 2.42.3-r600 x86, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index d10304f50208..2e7aebfed942 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     414b4a18798b4ca8ed8ffda7cb27e4bd4151b5ed
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 19:55:45 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 19:55:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414b4a18

net-libs/webkit-gtk: Stabilize 2.42.3-r410 ppc, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index 7a8bf7a7bb49..b989d422c21e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     708cf25b9c4ca309965953e89188b61d207bf49c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 19:55:49 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 19:55:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708cf25b

net-libs/webkit-gtk: Stabilize 2.42.3-r410 x86, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index b989d422c21e..a6bd35a61369 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     98bc530b42d033add3712fc6078391a28a71c226
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 19:55:45 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 19:55:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98bc530b

net-libs/webkit-gtk: Stabilize 2.42.3 ppc, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index 5375e0c646b1..d2b143cf4bf5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c0ff9f73cfb70a5b1e9796ee60a06088de683fb7
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 19:55:49 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 19:55:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ff9f73

net-libs/webkit-gtk: Stabilize 2.42.3 x86, #919979

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index d2b143cf4bf5..677e2a75b64d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     bf597e652e1b541359f4a4e1dae3a56a2b977b5d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 09:55:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 09:55:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf597e65

net-libs/webkit-gtk: Stabilize 2.42.4-r600 arm, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 750b51413093..cd1327005b6f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     ab7b611d665331bb71abbc0f6c4945c3a0cd4c8a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 09:55:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 09:55:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7b611d

net-libs/webkit-gtk: Stabilize 2.42.4 arm, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 86bbd5c5de8a..1b8e7f73d19b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     0021538dfb1720e4b83d0b6b3abf94e9926e1e22
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 09:55:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 09:55:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0021538d

net-libs/webkit-gtk: Stabilize 2.42.4-r410 arm, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 19c7f97e3817..508d1493ccba 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     f9ef02217f5adeff4c6e3fc45e11afd2a630f2f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:17:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:17:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ef0221

net-libs/webkit-gtk: Stabilize 2.42.4 ppc64, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 1b8e7f73d19b..72316262a3b3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     c1f961bd666718430d991684fc24409ab28d0eac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:18:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:18:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f961bd

net-libs/webkit-gtk: Stabilize 2.42.4-r410 ppc64, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 508d1493ccba..39cb654fda97 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     163fa5a907f55100deee72f66022c00d895027ce
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:18:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:18:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163fa5a9

net-libs/webkit-gtk: Stabilize 2.42.4-r600 ppc64, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index cd1327005b6f..47abf5077de8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     82321363c4a9534083ec67a38a108ff263c83727
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 19:55:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:55:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82321363

net-libs/webkit-gtk: Stabilize 2.42.4 arm64, #920667

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 72316262a3b3..8cb298ca32a8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     f5a1d6222e6dd679c50a96a084eaa69b4f39ed7f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 19:55:04 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:55:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a1d622

net-libs/webkit-gtk: Stabilize 2.42.4-r600 arm64, #920667

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 47abf5077de8..2e18e53fad45 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     19dc02cb3c115fd25c85cfd742df8ac89735e803
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 19:55:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:55:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19dc02cb

net-libs/webkit-gtk: Stabilize 2.42.4-r410 arm64, #920667

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 39cb654fda97..a774fc6a22fb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     203318f6a2f3882c55ea2c72d7a18c566764b7dc
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 21:33:51 2023 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 21:34:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203318f6

net-libs/webkit-gtk: enable ruby33

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index a774fc6a22fb..21f9214fe9c3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 2e18e53fad45..642cfe89e038 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 8cb298ca32a8..ec5e2d42380d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_REQ_USE="xml(+)"
 PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
 
 inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     21109fa861f07a6ae06cfbed1ef2c721bfae9afd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 12:35:53 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 12:35:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21109fa8

net-libs/webkit-gtk: filter LTO

ODR violations thanks to Bison. Fortunately, upstream are open to fixing it,
it just needs a hack like GDB did, or could even maybe just do --name-prefix
or something if Bison-only is OK.

Closes: https://bugs.gentoo.org/866896
Closes: https://bugs.gentoo.org/915230
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 5 ++++-
 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 5 ++++-
 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild      | 5 ++++-
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild      | 3 +++
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
index a6bd35a61369..67a6f3ef6fd2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -159,6 +159,9 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
index 2e7aebfed942..55fb6a6fc4ca 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -160,6 +160,9 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
index 677e2a75b64d..c2dbd794b679 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -157,6 +157,9 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index c88fc397b1f9..e6dfc1c380d3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -161,6 +161,9 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 599c268e4b4a..c8b32ef0b55a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -162,6 +162,9 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index b5ad3bd607ec..e781da1db735 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -159,6 +159,9 @@ src_configure() {
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC
 
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
 	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     6e3b01cbcdc619380f0616ea429ecb242f447ba6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 21:45:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 21:45:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3b01cb

net-libs/webkit-gtk: BDEPEND on dev-util/wayland-scanner

Closes: https://bugs.gentoo.org/921946
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 ++
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 ++
 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index e6dfc1c380d3..86af6fd15969 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -116,6 +116,8 @@ BDEPEND="
 	virtual/perl-Data-Dumper
 	virtual/perl-Carp
 	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index c8b32ef0b55a..f4105790ac36 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -117,6 +117,8 @@ BDEPEND="
 	virtual/perl-Data-Dumper
 	virtual/perl-Carp
 	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index e781da1db735..0a03309cca96 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -114,6 +114,8 @@ BDEPEND="
 	virtual/perl-Data-Dumper
 	virtual/perl-Carp
 	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
 "
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     11d6c0f4ee17eb712e378e5c6f6ad5068b4f1cb7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 21:46:43 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 21:46:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d6c0f4

net-libs/webkit-gtk: Stabilize 2.42.4 amd64, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 0a03309cca96..1781d039797f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     91dd3b023963920d9acdf8f35316807e5a14ac43
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 21:46:45 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 21:46:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dd3b02

net-libs/webkit-gtk: Stabilize 2.42.4-r600 amd64, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index f4105790ac36..4642f9333ac8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     9a44421310930f0d666675479305ce9e8bc20024
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 21:46:44 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 21:46:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a444213

net-libs/webkit-gtk: Stabilize 2.42.4-r410 amd64, #920667

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 86af6fd15969..d395bfa1cf57 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michał Górny]

commit:     a2f5d4dbfb34d6ec0ce5a1c8b4ae0c3e0685a046
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 17:03:50 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 17:03:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f5d4db

net-libs/webkit-gtk: Add missing := operator on media-libs/libjxl

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index d395bfa1cf57..68f473b5cc83 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
 
 	dev-libs/hyphen
 	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
 	avif? ( >=media-libs/libavif-0.9.0:= )
 	lcms? ( media-libs/lcms:2 )
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 4642f9333ac8..2d58a29cbfa2 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 
 	dev-libs/hyphen
 	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
 	avif? ( >=media-libs/libavif-0.9.0:= )
 	lcms? ( media-libs/lcms:2 )
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 1781d039797f..aa578715e450 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 
 	dev-libs/hyphen
 	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
 	avif? ( >=media-libs/libavif-0.9.0:= )
 	lcms? ( media-libs/lcms:2 )
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     5737210d17ce220e2246db5cb6181745698d66e5
Author:     Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Sun Feb 11 09:44:49 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 23:16:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5737210d

net-libs/webkit-gtk: Version bump to 2.42.5

Closes: https://github.com/gentoo/gentoo/pull/35270
Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 269 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 262 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild      | 259 +++++++++++++++++++++
 4 files changed, 791 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 9657f242e2a3..9ba870735d4e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839
 DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293
+DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516 SHA512 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
new file mode 100644
index 000000000000..54bf8cd4e088
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	# Fix assert failure on some machines, bug #920704
+	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
new file mode 100644
index 000000000000..e50d46619df2
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+# with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=gui-libs/gtk-4.4.0:4[introspection?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	# Fix assert failure on some machines, bug #920704
+	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
new file mode 100644
index 000000000000..d4913a9eb4f8
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
+# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.4.0
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/mesa
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.15
+		>=dev-libs/wayland-protocols-1.15
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	# Fix assert failure on some machines, bug #920704
+	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     6a15e7fb7003e9088b00be13d71d2330c09ee6af
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 08:38:42 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 08:38:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a15e7fb

net-libs/webkit-gtk: Stabilize 2.42.5-r600 ppc64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index 78f3686ffd25..5239f59ee3ba 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     85ee5f2019d0e52bae7cd7b76cb33ac8e374a609
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 08:38:43 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 08:38:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ee5f20

net-libs/webkit-gtk: Stabilize 2.42.5-r600 arm64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index 5239f59ee3ba..e9ea466e86c1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     e2b5dffe34775130e6834b2509e18ceb9a545b52
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 08:38:43 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 08:38:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b5dffe

net-libs/webkit-gtk: Stabilize 2.42.5 ppc64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index b2b5f75bcd7c..39e6985d8a9d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     ff47a20ac96415099c2d2c24bd33241237a0a85f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 08:38:44 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 08:38:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff47a20a

net-libs/webkit-gtk: Stabilize 2.42.5 arm64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index 39e6985d8a9d..660d9aedc799 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     941369f4ea3fe4d46a5407c39d2c459de83cea63
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 08:38:44 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 08:38:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941369f4

net-libs/webkit-gtk: Stabilize 2.42.5-r410 arm64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index e2cb1e3ebddc..d9453ccd75f4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     7b0a1cbbdc48e17790d82dad4ae72293d1b262c2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 08:38:42 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 08:38:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0a1cbb

net-libs/webkit-gtk: Stabilize 2.42.5-r410 ppc64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index 38d773a9d41c..e2cb1e3ebddc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     71fac0d5c2e15f71b7b279143029b8f3c2499c90
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 10:10:41 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 10:10:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fac0d5

net-libs/webkit-gtk: Stabilize 2.42.5-r600 arm, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index e9ea466e86c1..f05a694a54d6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c1e12a237c4f875df9f6a42feed253d28cd9b639
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 10:10:42 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 10:10:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e12a23

net-libs/webkit-gtk: Stabilize 2.42.5 arm, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index 660d9aedc799..dff6e99dfb5a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     739f1bcde53c6c3a06773d9372c9ec6fecaae908
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 10:10:42 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 10:10:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739f1bcd

net-libs/webkit-gtk: Stabilize 2.42.5-r410 arm, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index d9453ccd75f4..25c56717be09 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     d4d281db23fd8fe987c72c0e8b724b861a0ada7d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:24 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d281db

net-libs/webkit-gtk: Stabilize 2.42.5-r600 amd64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index 9cb575c72aa4..e952fa9fd8cc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     93fbdf3b824d55192c89dcf538fe824330b92aba
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:23 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93fbdf3b

net-libs/webkit-gtk: Stabilize 2.42.5 amd64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index 2a42d2527b9c..a1310a6cb85d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     edd8711dba5ede7db89f3e769707e1f0a53ab831
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:24 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd8711d

net-libs/webkit-gtk: Stabilize 2.42.5-r410 amd64, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index 05352596075f..ebda1582688d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     ac06b006c79bbb226c038c897e9cac9f5d414a43
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:20 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac06b006

net-libs/webkit-gtk: Stabilize 2.42.5 x86, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index dff6e99dfb5a..2a42d2527b9c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     a9ebec8f32b028dbdb2f20379f852b2e18d751ab
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:20 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ebec8f

net-libs/webkit-gtk: Stabilize 2.42.5-r410 x86, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index 25c56717be09..05352596075f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     f13d4a41bf56dc26b3eae8d5e1ced29cdafed959
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:20 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13d4a41

net-libs/webkit-gtk: Stabilize 2.42.5-r600 x86, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index f05a694a54d6..9cb575c72aa4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     b8025b79b469e992f7e1b6a2500a74794d6dfdc9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:56 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8025b79

net-libs/webkit-gtk: Stabilize 2.42.5-r600 ppc, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
index e952fa9fd8cc..9e1a4792fde3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     048afa72305b1fe6aaff2668d7d9b403371788ec
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:55 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048afa72

net-libs/webkit-gtk: Stabilize 2.42.5-r410 ppc, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
index ebda1582688d..b41dc9910b2a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     3b05c2206f3aa1fbf1d66602801b71dd8700e1d3
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 18:11:55 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 18:11:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b05c220

net-libs/webkit-gtk: Stabilize 2.42.5 ppc, #928803

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
index a1310a6cb85d..823fcda8ef91 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Mart Raudsepp]

commit:     a6b6dc6b54341e720273ca212ba6abec25476845
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 17:29:52 2024 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 17:29:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b6dc6b

net-libs/webkit-gtk: security cleanup

Bug: https://bugs.gentoo.org/923851
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 266 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 259 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild      | 256 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 270 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 263 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild      | 260 ---------------------
 7 files changed, 1576 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1c1728b2f43a..d16f12f021d7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
-DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839
-DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293
 DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516 SHA512 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
deleted file mode 100644
index e42873a09ccd..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
deleted file mode 100644
index 8e47bab09487..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=gui-libs/gtk-4.4.0:4[introspection?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
deleted file mode 100644
index 947457b3bc6d..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
deleted file mode 100644
index 39b921345132..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix assert failure on some machines, bug #920704
-	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-4.1
-	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
deleted file mode 100644
index 71847398694a..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=gui-libs/gtk-4.4.0:4[introspection?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix assert failure on some machines, bug #920704
-	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
deleted file mode 100644
index 0bd69d249c30..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby30 ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is
-# experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.4.0
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	dev-libs/libtasn1:=
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt
-	)
-
-	dev-libs/hyphen
-	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/mesa
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.15
-		>=dev-libs/wayland-protocols-1.15
-		>=gui-libs/libwpe-1.5.0:1.0
-		>=gui-libs/wpebackend-fdo-1.7.0:1.0
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix assert failure on some machines, bug #920704
-	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-	fi
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_OPENGL_OR_ES=ON
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "(MPEG-)DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP-Live-Streaming support" "media-plugins/gst-plugins-hls"
-}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     85236f2e1283a05c351bb20fd68b63ccc5852961
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 23:56:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:56:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85236f2e

net-libs/webkit-gtk: Stabilize 2.44.1-r600 arm, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index 2085212d4260..385fa304831e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     fd9f2e8b5bd3c16bd79ca09b97ed4b9293929131
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 23:56:30 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:56:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9f2e8b

net-libs/webkit-gtk: Stabilize 2.44.1 arm, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index 8659742dfec1..2c33536bf432 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     abe9d8086c878ce69c47b0ece6ec47336073e9a9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 16 23:56:31 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 23:56:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe9d808

net-libs/webkit-gtk: Stabilize 2.44.1-r410 arm, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index 94f180c00cbc..6794c5c5aa5a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     b1045ae443da31715d4718ef96f979fe2c725444
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 06:53:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 06:53:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1045ae4

net-libs/webkit-gtk: Stabilize 2.44.1 ppc64, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index 2c33536bf432..508a5427c0ab 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     f382412671d89e5bd37ce29bc219fd0ca2392f06
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 06:53:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 06:53:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3824126

net-libs/webkit-gtk: Stabilize 2.44.1-r600 ppc64, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index 385fa304831e..b1f209c670fd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     6b5e6749935e4b5a22d7e815207fb8926c2012ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 06:53:38 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 06:53:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5e6749

net-libs/webkit-gtk: Stabilize 2.44.1-r410 ppc64, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index 6794c5c5aa5a..41098cceb03b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     a23c377203dec00a434b99357c8961c819153ed0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 23:28:30 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 23:28:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a23c3772

net-libs/webkit-gtk: Stabilize 2.44.1-r410 amd64, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index 41098cceb03b..bc40ebb5aca9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     0cb62fa6b82c426f2c68874c217cba39629bf821
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 23:28:29 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 23:28:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb62fa6

net-libs/webkit-gtk: Stabilize 2.44.1 amd64, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index 508a5427c0ab..ab20e5f173bb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Sam James]

commit:     4270e297945e0b23823394a8a63a7b2595a924e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 17 23:28:31 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 23:28:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4270e297

net-libs/webkit-gtk: Stabilize 2.44.1-r600 amd64, #930117

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index b1f209c670fd..7777c042a3c6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     421b45f655d7058850bbecd57b8a1ef4054ea8cf
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 10:08:21 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 10:08:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421b45f6

net-libs/webkit-gtk: Stabilize 2.44.1-r410 arm64, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index bc40ebb5aca9..9b9ac30a0817 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     526cc489f50f7685dd6a9810d813033b0953f5b0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 10:08:21 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 10:08:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526cc489

net-libs/webkit-gtk: Stabilize 2.44.1 arm64, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index ab20e5f173bb..4b352f620ac8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     c865eb9a526d4109e5ecdc7ef150ae38bb9694c0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 10:08:22 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 10:08:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c865eb9a

net-libs/webkit-gtk: Stabilize 2.44.1-r600 arm64, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index 7777c042a3c6..a950ae6fb7b7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     1e62533bed3dd37b6b114e57e14fd9bb427b5aee
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 10:09:03 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 10:09:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e62533b

net-libs/webkit-gtk: Stabilize 2.44.1-r410 ppc, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index 9b9ac30a0817..8f92318830e5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     98e5531ae3cdc1039f4ec4a0a9032034ba73573c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 10:09:03 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 10:09:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e5531a

net-libs/webkit-gtk: Stabilize 2.44.1 ppc, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index 4b352f620ac8..41a73a465a2d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     327a690976477973d0dc85a73b8725ecc6d8be98
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 10:09:04 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 10:09:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327a6909

net-libs/webkit-gtk: Stabilize 2.44.1-r600 ppc, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index a950ae6fb7b7..bf58dce79d75 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     fe2a561583a45455eeafedb540a573f81f8d3cf9
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 11:11:45 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 11:11:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2a5615

net-libs/webkit-gtk: Stabilize 2.44.1 x86, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
index 41a73a465a2d..69d3434a09ce 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     597bdbee100297d2074e1333f875d3de94c1d7f6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 11:11:45 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 11:11:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597bdbee

net-libs/webkit-gtk: Stabilize 2.44.1-r410 x86, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
index 8f92318830e5..94d5800a3acd 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Arthur Zamarin]

commit:     3d3cd25c5f9b9653ca5226410e82069a998dd804
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 11:11:46 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 11:11:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3cd25c

net-libs/webkit-gtk: Stabilize 2.44.1-r600 x86, #930117

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index bf58dce79d75..dca160b9f744 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     72e0e56ba75971457031580061ea0ae3cc0c686c
Author:     Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Wed Aug 14 05:07:38 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 00:07:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e0e56b

net-libs/webkit-gtk: Version bump to 2.44.3

Closes: https://github.com/gentoo/gentoo/pull/38139
Signed-off-by: Branko Grubic <bitlord0xff <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild | 255 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild | 267 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild      | 253 ++++++++++++++++++++
 4 files changed, 776 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a2743d6dd8b3..1b240705c7d3 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
 DIST webkitgtk-2.44.2.tar.xz 36289060 BLAKE2B f92ba55adf7bfea165d9950ffbea6f848466be7c6a96b50e0c1c080964415b3e1b44f65c22fa8f64e907e6e7785bd86082452ce15c62ff52811ebc7b8d6b1071 SHA512 b7eb85c1695b7240285fd467443829c94b0c015fba9953a6e370d2195a3e3afab951bab279c922e7499ba7ca150949f3c1126b6100b30b08bef3338f84f08ac5
+DIST webkitgtk-2.44.3.tar.xz 37250176 BLAKE2B 70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc SHA512 a98c15d6e68d2346abf75acf3447a11ba0f1c788a60847465d57856aa8b2fbad54e6f0c3a96edd3960919d2f12ba7a7313d37a2ebce21f493f8a6555d8e88ee0

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
new file mode 100644
index 000000000000..c150ea58d69d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
+# media-libs/mesa dep is for libgbm
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	dev-libs/libtasn1:=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.5.4[egl(+)]
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? ( x11-libs/libX11 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
new file mode 100644
index 000000000000..7952234cddf5
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
+# media-libs/mesa dep is for libgbm
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary;
+# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it
+# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
+# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used?
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	dev-libs/libtasn1:=
+	>=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.5.4[egl(+)]
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? ( x11-libs/libX11 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+	!<net-libs/webkit-gtk-2.44:4.1
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-6.0
+	doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
new file mode 100644
index 000000000000..a5535bd92795
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
+# media-libs/mesa dep is for libgbm
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	dev-libs/libtasn1:=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.5.4[egl(+)]
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? ( x11-libs/libX11 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build compilation on arm64
+	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     77f5000b1f0138d4a0ee2a8a0af5446ea67871fd
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 11:32:08 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 17:48:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f5000b

net-libs/webkit-gtk: add workaround for riscv build failure

There's a reproducible build failure on riscv that has been open
upstream for almost six months. On my machine at least, it can be worked
around by passing -DENABLE_JIT=OFF to CMake, so let's do that in the
meantime when USE=riscv is set.

Closes: https://bugs.gentoo.org/938162
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild | 3 +++
 net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild      | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
index c150ea58d69d..83b7c85cddc9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
@@ -240,6 +240,9 @@ src_configure() {
 		-DUSE_WOFF2=ON
 	)
 
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
index 7952234cddf5..4deeda8e8d09 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
@@ -244,6 +244,9 @@ src_configure() {
 		-DUSE_WOFF2=ON
 	)
 
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
index a5535bd92795..8bb3bea943e0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
@@ -238,6 +238,9 @@ src_configure() {
 		-DUSE_WOFF2=ON
 	)
 
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
 	# https://bugs.gentoo.org/761238
 	append-cppflags -DNDEBUG
 

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     04b72a137761e28d5456b030a7f0ce5ab3796faf
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 12:25:21 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 12:50:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b72a13

net-libs/webkit-gtk: add 2.44.4

Tested with/without jumbo build, r410 in Evolution and r600 in
Epiphany. And finally reordering $S to make pkgcheck be quiet.

Bug: https://bugs.gentoo.org/938026
Closes: https://bugs.gentoo.org/939541
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   1 +
 net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild | 250 +++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild | 262 ++++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild      | 248 ++++++++++++++++++++
 4 files changed, 761 insertions(+)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1b240705c7d3..1cf1c6bcd701 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
 DIST webkitgtk-2.44.2.tar.xz 36289060 BLAKE2B f92ba55adf7bfea165d9950ffbea6f848466be7c6a96b50e0c1c080964415b3e1b44f65c22fa8f64e907e6e7785bd86082452ce15c62ff52811ebc7b8d6b1071 SHA512 b7eb85c1695b7240285fd467443829c94b0c015fba9953a6e370d2195a3e3afab951bab279c922e7499ba7ca150949f3c1126b6100b30b08bef3338f84f08ac5
 DIST webkitgtk-2.44.3.tar.xz 37250176 BLAKE2B 70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc SHA512 a98c15d6e68d2346abf75acf3447a11ba0f1c788a60847465d57856aa8b2fbad54e6f0c3a96edd3960919d2f12ba7a7313d37a2ebce21f493f8a6555d8e88ee0
+DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
new file mode 100644
index 000000000000..c5c987b309b7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
+# media-libs/mesa dep is for libgbm
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	dev-libs/libtasn1:=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.5.4[egl(+)]
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? ( x11-libs/libX11 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
new file mode 100644
index 000000000000..74e734148d8b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="6/0" # soname version of libwebkit2gtk-6.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
+# media-libs/mesa dep is for libgbm
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary;
+# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it
+# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
+# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used?
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	dev-libs/libtasn1:=
+	>=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.5.4[egl(+)]
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? ( x11-libs/libX11 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+	!<net-libs/webkit-gtk-2.44:4.1
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=ON
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=ON # webkit2gtk-6.0
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-6.0
+	doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
new file mode 100644
index 000000000000..8014b23c361b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..12} )
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+# Tests do not run when built from tarballs
+# https://bugs.webkit.org/show_bug.cgi?id=215986
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
+# media-libs/mesa dep is for libgbm
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#       with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	dev-libs/libtasn1:=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/libepoxy-1.5.4[egl(+)]
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	media-libs/libwebp:=
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	x11-libs/libdrm
+	media-libs/mesa
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
+		media-libs/gst-plugins-base:1.0[opengl]
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? ( x11-libs/libX11 )
+
+	dev-libs/hyphen
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	media-libs/libglvnd
+	wayland? (
+		>=dev-libs/wayland-1.20
+		>=dev-libs/wayland-protocols-1.24
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	dev-util/unifdef
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	wayland? ( dev-util/wayland-scanner )
+"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
+# gnome2_src_prepare, and both apply ${PATCHES[@]}
+PATCHES=()
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	# Fix USE=-jumbo-build on all arches
+	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
+	filter-lto
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	local RUBY
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
+			RUBY="$(type -P ${rubyimpl})"
+			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
+	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
+	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
+	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
+		${ruby_interpreter}
+		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
+		-DENABLE_WEBGL=ON
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DUSE_AVIF=$(usex avif)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_GBM=ON
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=$(usex jpegxl)
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBBACKTRACE=OFF
+		-DUSE_LIBDRM=ON
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex keyring)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+	)
+
+	# Temporary workaround for bug 938162 (upstream bug 271371).
+	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
+	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
+	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
+	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     a372fc4a0e578e9931927c3e89d27a0e672d02af
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 12:41:35 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 12:50:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a372fc4a

net-libs/webkit-gtk: reformat a big comment to avoid line length warnings

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild | 27 ++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
index 74e734148d8b..40c4ca188498 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
@@ -26,16 +26,23 @@ REQUIRED_USE="|| ( aqua wayland X )"
 # https://bugs.webkit.org/show_bug.cgi?id=215986
 RESTRICT="test"
 
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary;
-# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it
-# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
-# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used?
+# Dependencies can be found in Source/cmake/OptionsGTK.cmake.
+#
+# * Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream.
+# * media-libs/mesa dep is for libgbm
+# * >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# * TODO: gst-plugins-base[X] is only needed when build configuration ends up
+#         with GLX set, but that's a bit automagic too to fix
+# * Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since
+# * 2.44 this SLOT ships the WebKitWebDriver binary; WebKitWebDriver is
+#   an automation tool for web developers, which lets one control the
+#   browser via WebDriver API - only one SLOT can ship it.
+# * TODO: There is build-time conditional depend on gtk-4.13.4 for using
+#   more efficient DmaBuf buffer type instead of EglImage, and
+#   gtk-4.13.7 for a11y support - ensure it at some point with a min dep
+# * at-spi2-core (atspi-2.pc) is checked at build time, but not linked
+#   to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14
+#   a11y support is used?
 RDEPEND="
 	>=x11-libs/cairo-1.16.0[X?]
 	>=media-libs/fontconfig-2.13.0:1.0

[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/

[Michael Orlitzky]

commit:     402f0dfb5f68f6866c223aafbe1d2acc8515a4ec
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 12:26:27 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 12:50:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402f0dfb

net-libs/webkit-gtk: drop old 2.44.2 and 2.44.3

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 net-libs/webkit-gtk/Manifest                      |   2 -
 net-libs/webkit-gtk/webkit-gtk-2.44.2-r410.ebuild | 251 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.44.2-r600.ebuild | 263 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.44.2.ebuild      | 249 --------------------
 net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild | 252 ---------------------
 net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild | 264 ----------------------
 net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild      | 250 --------------------
 7 files changed, 1531 deletions(-)

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 1cf1c6bcd701..eaa0b83fa672 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,2 @@
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
-DIST webkitgtk-2.44.2.tar.xz 36289060 BLAKE2B f92ba55adf7bfea165d9950ffbea6f848466be7c6a96b50e0c1c080964415b3e1b44f65c22fa8f64e907e6e7785bd86082452ce15c62ff52811ebc7b8d6b1071 SHA512 b7eb85c1695b7240285fd467443829c94b0c015fba9953a6e370d2195a3e3afab951bab279c922e7499ba7ca150949f3c1126b6100b30b08bef3338f84f08ac5
-DIST webkitgtk-2.44.3.tar.xz 37250176 BLAKE2B 70ee02b2d5828907d7659db903f5dbc4db628af47e421db1b105163a5cec902be19f740e752179e7cda3e605af232150bb1fb37efd2382d7d4f2454fd3f8bccc SHA512 a98c15d6e68d2346abf75acf3447a11ba0f1c788a60847465d57856aa8b2fbad54e6f0c3a96edd3960919d2f12ba7a7313d37a2ebce21f493f8a6555d8e88ee0
 DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.2-r410.ebuild
deleted file mode 100644
index ec66882a3815..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.2-r410.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	dev-libs/libtasn1:=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.5.4[egl(+)]
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	media-libs/libwebp:=
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	x11-libs/libdrm
-	media-libs/mesa
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? ( x11-libs/libX11 )
-
-	dev-libs/hyphen
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.20
-		>=dev-libs/wayland-protocols-1.24
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix USE=-jumbo-build on all arches
-	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=274261
-	eapply "${FILESDIR}"/${PV}-excessive-cpu-usage.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBBACKTRACE=OFF
-		-DUSE_LIBDRM=ON
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
-	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.2-r600.ebuild
deleted file mode 100644
index 5a7e2441bbc7..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.2-r600.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary;
-# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it
-# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
-# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used?
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	dev-libs/libtasn1:=
-	>=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.5.4[egl(+)]
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	media-libs/libwebp:=
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	x11-libs/libdrm
-	media-libs/mesa
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? ( x11-libs/libX11 )
-
-	dev-libs/hyphen
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.20
-		>=dev-libs/wayland-protocols-1.24
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-	!<net-libs/webkit-gtk-2.44:4.1
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix USE=-jumbo-build on all arches
-	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=274261
-	eapply "${FILESDIR}"/${PV}-excessive-cpu-usage.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBBACKTRACE=OFF
-		-DUSE_LIBDRM=ON
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-6.0
-	doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
-	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.2.ebuild
deleted file mode 100644
index 636358a37b1d..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	dev-libs/libtasn1:=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.5.4[egl(+)]
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	media-libs/libwebp:=
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	x11-libs/libdrm
-	media-libs/mesa
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? ( x11-libs/libX11 )
-
-	dev-libs/hyphen
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.20
-		>=dev-libs/wayland-protocols-1.24
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix USE=-jumbo-build on all arches
-	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=274261
-	eapply "${FILESDIR}"/${PV}-excessive-cpu-usage.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBBACKTRACE=OFF
-		-DUSE_LIBDRM=ON
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
-	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
deleted file mode 100644
index 63d7fd2092d3..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r410.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	dev-libs/libtasn1:=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.5.4[egl(+)]
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	media-libs/libwebp:=
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	x11-libs/libdrm
-	media-libs/mesa
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? ( x11-libs/libX11 )
-
-	dev-libs/hyphen
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.20
-		>=dev-libs/wayland-protocols-1.24
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix USE=-jumbo-build on all arches
-	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBBACKTRACE=OFF
-		-DUSE_LIBDRM=ON
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# Temporary workaround for bug 938162 (upstream bug 271371).
-	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
-	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
deleted file mode 100644
index d8f534fe4258..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3-r600.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary;
-# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it
-# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
-# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used?
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	dev-libs/libtasn1:=
-	>=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.5.4[egl(+)]
-	>=net-libs/libsoup-3.0.8:3.0[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	media-libs/libwebp:=
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	x11-libs/libdrm
-	media-libs/mesa
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? ( x11-libs/libX11 )
-
-	dev-libs/hyphen
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.20
-		>=dev-libs/wayland-protocols-1.24
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-	!<net-libs/webkit-gtk-2.38:4
-	!<net-libs/webkit-gtk-2.44:4.1
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix USE=-jumbo-build on all arches
-	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
-		-DENABLE_WEBDRIVER=ON
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=ON # webkit2gtk-6.0
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBBACKTRACE=OFF
-		-DUSE_LIBDRM=ON
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_SOUP2=OFF
-		-DUSE_WOFF2=ON
-	)
-
-	# Temporary workaround for bug 938162 (upstream bug 271371).
-	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to webkit2gtk-6.0
-	doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
-	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
deleted file mode 100644
index 1f69b75d4d31..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.3.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-#       with GLX set, but that's a bit automagic too to fix
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[X?]
-	>=media-libs/fontconfig-2.13.0:1.0
-	>=media-libs/freetype-2.9.0:2
-	>=dev-libs/libgcrypt-1.7.0:0=
-	dev-libs/libtasn1:=
-	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	>=dev-libs/icu-61.2:=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/libepoxy-1.5.4[egl(+)]
-	>=net-libs/libsoup-2.54:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3
-	sys-libs/zlib:0
-	media-libs/libwebp:=
-	>=app-accessibility/at-spi2-core-2.46.0:2
-
-	>=dev-libs/glib-2.70.0:2
-	>=dev-libs/libxslt-1.1.7
-	media-libs/woff2
-	keyring? ( app-crypt/libsecret )
-	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
-	x11-libs/libdrm
-	media-libs/mesa
-	spell? ( >=app-text/enchant-0.22:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
-		media-libs/gst-plugins-base:1.0[opengl]
-		>=media-plugins/gst-plugins-opus-1.20:1.0
-		>=media-libs/gst-plugins-bad-1.20:1.0
-	)
-
-	X? ( x11-libs/libX11 )
-
-	dev-libs/hyphen
-	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
-	avif? ( >=media-libs/libavif-0.9.0:= )
-	lcms? ( media-libs/lcms:2 )
-
-	media-libs/libglvnd
-	wayland? (
-		>=dev-libs/wayland-1.20
-		>=dev-libs/wayland-protocols-1.24
-	)
-
-	seccomp? (
-		>=sys-apps/bubblewrap-0.3.1
-		sys-libs/libseccomp
-		sys-apps/xdg-dbus-proxy
-	)
-
-	systemd? ( sys-apps/systemd:= )
-	gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gperf-3.0.1
-	dev-util/unifdef
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	>=dev-lang/perl-5.10
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-	virtual/perl-JSON-PP
-
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++17 ; then
-			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	# Fix USE=-jumbo-build compilation on arm64
-	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
-	# Fix USE=-jumbo-build on all arches
-	eapply "${FILESDIR}"/2.44.1-non-unified-build-fixes.patch
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
-	filter-lto
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
-	# Ruby situation is a bit complicated. See bug 513888
-	local rubyimpl
-	local ruby_interpreter=""
-	local RUBY
-	for rubyimpl in ${USE_RUBY}; do
-		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
-			RUBY="$(type -P ${rubyimpl})"
-			ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
-		fi
-	done
-	# This will rarely occur. Only a couple of corner cases could lead us to
-	# that failure. See bug 513888
-	[[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
-	# JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
-	# so it doesn't respect RUBY_EXECUTABLE, bug #771744.
-	sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-
-	local mycmakeargs=(
-		-DPython_EXECUTABLE="${PYTHON}"
-		${ruby_interpreter}
-		# If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
-		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
-		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
-		-DPORT=GTK
-		# Source/cmake/WebKitFeatures.cmake
-		-DENABLE_API_TESTS=OFF
-		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
-		-DENABLE_GAMEPAD=$(usex gamepad)
-		-DENABLE_MINIBROWSER=$(usex examples)
-		-DENABLE_PDFJS=$(usex pdf)
-		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
-		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
-		-DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
-		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
-		-DENABLE_WEBGL=ON
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DUSE_AVIF=$(usex avif)
-		# Source/cmake/OptionsGTK.cmake
-		-DENABLE_DOCUMENTATION=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JOURNALD_LOG=$(usex systemd)
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DUSE_GBM=ON
-		-DUSE_GTK4=OFF
-		-DUSE_JPEGXL=$(usex jpegxl)
-		-DUSE_LCMS=$(usex lcms)
-		-DUSE_LIBBACKTRACE=OFF
-		-DUSE_LIBDRM=ON
-		-DUSE_LIBHYPHEN=ON
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_SOUP2=ON
-		-DUSE_WOFF2=ON
-	)
-
-	# Temporary workaround for bug 938162 (upstream bug 271371).
-	use riscv && mycmakeargs+=( -DENABLE_JIT=OFF )
-
-	# https://bugs.gentoo.org/761238
-	append-cppflags -DNDEBUG
-
-	WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
-	optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
-	optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
-	optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
-	optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}