gentoo resync : 02.02.2022

3 files changed, 45 insertions, 7 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index ff6480b738da..1cba1e669c9c 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,6 +1,7 @@
+AUX 41.3-fix-build-with-meson-0.61.1.patch 1106 BLAKE2B 78b69397c406793be23a2f267389baeb5f7cf73eeee6b27a5deda96a9fbd495a17836023ad8aa69fc0f8a0b8514983e1cc7bb42fed676e541b732db7f3c0f294 SHA512 2e8c9f62884b9d0684ec92f38112737fd67e2d21570f92cc3a3f500029169ad62630d227fff0e4bc8cd6fa0e9d72aa02c416c5805a7572f3c66b5f0801c4b7a2
 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
-DIST epiphany-40.5.tar.xz 5380340 BLAKE2B 60dcdacd8fc199e68d2009c841e5d80e54c6246b9f39f9d6523fb8dcd837dba4a949911643c634abb5c53e08473e92b5bde90709ec8650cc23c4aceaeac14edd SHA512 939fc749723c87457a73b90fadb37e8c6db0996ada73d5c859ff3f9b8a2401bca369a8145336542a169b006a9c0e02f6642a1a39b3770654d30cb28b55e69972
 DIST epiphany-40.6.tar.xz 5380620 BLAKE2B 43a0ba03ebab5af074785beecacbf7279f0ee44c7f12467441fc026d8e48c16a1d3391080d2960d6b72027995b9fc203c15cbfa17db35cbf010edfa9d472422c SHA512 92805afe14323547c816beb43da104c05b62c59b64d7e3dc194f8e89be3abf309261310da11ff5c5ba99809794b796de9911316d77663a7c51b3a79b63fe4e1f
-EBUILD epiphany-40.5.ebuild 1922 BLAKE2B d6a8d5b44501a69e163aa14fa793c178b4c9ee9e0743f1b6e579c5798644037906772b028895a60dc6d0f34427d3e873fdb4138fca41587cd01fa13b0ba472c7 SHA512 86651c62be596f623c6b473155c4c618c16687ab3a80c6fbd516a419095638755f9373e8b51c9a29707e3648482f71d41e5b493a8bdaa274fdbbc144c06dd36d
+DIST epiphany-41.3.tar.xz 6153540 BLAKE2B bd95f643be4947818ebfafb1316a03c7c6cf118a45583f07e9fde60e32dabd63edf173673b86e454d9af066769950276cf77ea50fac8dd204fcae06c6ad04126 SHA512 1effef22291687c8ff2252eced24274db3b1f4afacfc3053a33cae85112759918f80d824bb02b7e17d95364eec0062cb3459a6079783d9c900874cc150ea98ba
 EBUILD epiphany-40.6.ebuild 1922 BLAKE2B 0665288fcf90558e501637fb10d66372986c9a4ee8ef1c2c009588671781b988b86f1dd7776acf28746ad16355c8d04c3f02b76a3e78bb773cd5081f9b146720 SHA512 c8d7f60760eeca478bbf84f0cdf08e4b0776fb293c363854293775f1f0e411a09a1f48ce6b9567bba9c4a0a913233d497994f3d816eac2770e0f71de8b725958
+EBUILD epiphany-41.3.ebuild 1997 BLAKE2B d3cab311a4ab7b904abd62807acef8815f1801a1aa52685f224345e87d7bc7fb0203aa266f97784bce3ce68c25ac7327acd04687f0d327ad52793b0854fe064f SHA512 447be4f9abd0e4a56159ef5146dce01c31b479e533ffbb6ca0838caf7e5a69a1719010f3a9ebd06ed066087fb1115eafa17b7fcf0bf21f230d8cc913ecdf6b5d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-40.5.ebuild b/www-client/epiphany/epiphany-41.3.ebuild
index 8ecf78df9d8d..a49751cb9e30 100644
--- a/www-client/epiphany/epiphany-40.5.ebuild
+++ b/www-client/epiphany/epiphany-41.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit gnome.org gnome2-utils meson xdg virtualx
 
@@ -12,13 +12,13 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="
-	>=dev-libs/glib-2.64.0:2
+	>=dev-libs/glib-2.67.1:2
 	>=x11-libs/gtk+-3.24.0:3
 	>=dev-libs/nettle-3.4:=
-	>=net-libs/webkit-gtk-2.31.1:4=
+	>=net-libs/webkit-gtk-2.33.2:4=
 	>=x11-libs/cairo-1.2
 	>=app-crypt/gcr-3.5.5:=[gtk]
 	>=x11-libs/gdk-pixbuf-2.36.5:2
@@ -50,6 +50,7 @@ BDEPEND="
 PATCHES=(
 	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
 	"${FILESDIR}"/var-tmp-tests.patch
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
 )
 
 src_configure() {
@@ -61,6 +62,7 @@ src_configure() {
 		-Dnetwork_tests=disabled
 		-Dtech_preview=false
 		$(meson_feature test unit_tests)
+		-Dsoup2=enabled
 	)
 	meson_src_configure
 }
diff --git a/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..7b521c052574
--- /dev/null
+++ b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/epiphany/-/commit/bfbb5f7bab38301d8a4a444173acdae8d9692146
+https://bugs.gentoo.org/831923
+
+From: rvalue <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 46df3fd80..eac6b8224 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.desktop.in.in'),
+     output: 'org.gnome.Epiphany.desktop.in',
+@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.appdata.xml.in.in'),
+     output: 'org.gnome.Epiphany.appdata.xml.in',
+-- 
+GitLab
+