gentoo resync : 09.07.2022

3 files changed, 19 insertions, 19 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 65323a42e5d9..4415c0e19c0c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
-DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
-EBUILD webkit-gtk-2.36.1.ebuild 7442 BLAKE2B e573bec3b57464a80aec549ad4759418d8a8a0f4ce812e510c8f17ca45bb760d41c0634c63c3973c328e7d4ce4275f01dfac4f77463d3170061f530f44ec0e26 SHA512 2acd23be1757f6e40f6be3e39d9bcc1c4a8ee885a4d621a2775d4ed6befc94d9755e7bd397300af0fc96177c4b3739740c3160532a747c384088013be30811ac
-EBUILD webkit-gtk-2.36.3.ebuild 7410 BLAKE2B eb95c068b7c42dbb49d031be9a7bf6a8635d5126a0052b2215cbc4e6c44192ab754627b006dedd2d85a637749eba96f33366075b9af2a5322e460b88a955d846 SHA512 684c6085cb9dfe377e0870292b6c31461c1a4a733aceff2637ffbaec21479b7a71091d570940005f2daa2f1253dd4908200ce4486188fa4895a2402f9aaf8663
+DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
+EBUILD webkit-gtk-2.36.3.ebuild 7409 BLAKE2B e2f941a57bb827f86ae95e98af0187b0a4a301402470165be293e03efd9cd96834866bf7c69eefe3369d26a7926afb6b5b46061362b166652dcf29e581f120c5 SHA512 3d6226815a55d0b67550c6a0a405f7f4442715c528ed653858b6152f61ac36db6c080e9eb44fc504d61830a84da56a265e6f6dd2abb38227d9ff752393bd2cc8
+EBUILD webkit-gtk-2.36.4.ebuild 7431 BLAKE2B 448433c468ab5cd2ed5d7f3e052f884096f68b467c1a715d7e76cd0bebb070360ea6f9b448de55d38ef4249809ff330e3dd84ed79fb0c60ff68453a1f0e7984c SHA512 94decf9608f83c87d3d46bcbbf06659089e3518325b36610c2ee42d172064a868b23e9f5a6aca9b0e6661b819238eae4e231e64c67b5541fdcb201fc2fa4d882
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
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"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
index bb28e81e3161..ac5ee1a431b0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.4.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
+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
+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"
@@ -15,9 +15,9 @@ SRC_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"
+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="
@@ -43,7 +43,7 @@ RDEPEND="
 	>=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=
+	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=
@@ -60,12 +60,12 @@ RDEPEND="
 	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?]
+		>=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.14.4-r1:1.0
-		>=media-libs/gst-plugins-bad-1.14:1.0
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
 	)
 
 	X? (
@@ -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,16 +121,11 @@ 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]
 #		x11-themes/hicolor-icon-theme
 #	)
-RDEPEND="${RDEPEND}
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -211,7 +207,7 @@ src_configure() {
 		-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_GEOLOCATION=ON # Runtime optional (talks over dbus service)
 		-DENABLE_MINIBROWSER=$(usex examples)
 		-DENABLE_SPELLCHECK=$(usex spell)
 		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
@@ -248,3 +244,7 @@ src_configure() {
 
 	WK_USE_CCACHE=NO cmake_src_configure
 }
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}