gentoo resync : 20.03.2022

3 files changed, 2 insertions, 89 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 1cba1e669c9c..ed89dc9c8362 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,7 +1,5 @@
 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.6.tar.xz 5380620 BLAKE2B 43a0ba03ebab5af074785beecacbf7279f0ee44c7f12467441fc026d8e48c16a1d3391080d2960d6b72027995b9fc203c15cbfa17db35cbf010edfa9d472422c SHA512 92805afe14323547c816beb43da104c05b62c59b64d7e3dc194f8e89be3abf309261310da11ff5c5ba99809794b796de9911316d77663a7c51b3a79b63fe4e1f
 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
+EBUILD epiphany-41.3.ebuild 1994 BLAKE2B 98573353317a56cab47f0f419f1e0f19ea485ae68813e9058eb2b5dac1ca3576607406b33cc3809ff5216999423aa69f65eabb526aa7d1dd54887c5829fca8c9 SHA512 789a4c0338db5ddd26768a3496f576ece86d298c3d682f1b4144ed61a72e0336c49a4646b979aaf439b46d4d927cdf67ecd310b11edd2c5f7d2dffbe1abe9917
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-40.6.ebuild b/www-client/epiphany/epiphany-40.6.ebuild
deleted file mode 100644
index 3486b10a3cef..000000000000
--- a/www-client/epiphany/epiphany-40.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64.0:2
-	>=x11-libs/gtk+-3.24.0:3
-	>=dev-libs/nettle-3.4:=
-	>=net-libs/webkit-gtk-2.31.1:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.35
-	>=dev-libs/json-glib-1.6
-	app-arch/libarchive:=
-	>=dev-libs/libdazzle-3.37.1
-	>=gui-libs/libhandy-1.1.0:1=
-	>=app-crypt/libsecret-0.19
-	>=net-libs/libsoup-2.48.0:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-db/sqlite-3.22:3
-	dev-libs/gmp:0=
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-# appstream-glib needed for appdata.xml gettext translation
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
-	"${FILESDIR}"/var-tmp-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddeveloper_mode=false
-		-Dlibportal=disabled
-		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
-		# is commented out upstream anyway
-		-Dnetwork_tests=disabled
-		-Dtech_preview=false
-		$(meson_feature test unit_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version net-libs/webkit-gtk[jpeg2k]; then
-		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
-		ewarn "Various image galleries/managers may be broken."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/www-client/epiphany/epiphany-41.3.ebuild b/www-client/epiphany/epiphany-41.3.ebuild
index a49751cb9e30..a79f26b59101 100644
--- a/www-client/epiphany/epiphany-41.3.ebuild
+++ b/www-client/epiphany/epiphany-41.3.ebuild
@@ -12,7 +12,7 @@ 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.67.1:2