gentoo resync : 31.05.2021

4 files changed, 3 insertions, 175 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index eca061794493..0da1f5de4b6a 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,8 +1,4 @@
 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
-DIST epiphany-3.34.4.tar.xz 5295624 BLAKE2B c1867f62f1a0675466e2679d7f9e568abac6a4f3f56c498abfdc3d4ca4510696c4e9cbcab99a8be90bb50c77b04bcb86456a82dbefa76a2a7ec2c6b373ce9c39 SHA512 d9700196e0397032dd84d1fbf14d193f4212dd8dc054320267b4dfc8a59246de9c93fb786ba76463f0c09e7997b26efa17288cc06eddd0fb4aad2e4bdd4276ce
-DIST epiphany-3.36.4.tar.xz 5824436 BLAKE2B f837cd5c8cbdd046851f77777fcd7f5360a759952cde54231656226b1e878ebdd574d72ed4ad16a6db83556ab8a6eaf754b67b1a195c1fcda2f1635099c9edb3 SHA512 f80a2a6fa4b2fa158ff2232f4e2b3d3cfe69e9368290805db741646cd67d3485a44e4ea8cba29d152abc0f69cbc0c6274fe5d1ec20347de2e077ac940e08aef3
 DIST epiphany-40.1.tar.xz 5374236 BLAKE2B 71508de3554ef646061ab7ff62df8892fed0b7add112309d2660ed3795fee3e2e9460bbc80c7cec402e1922eafffcffae7845761a23b13f3245f5a688599e7ba SHA512 8598ae77f8ba446e132a82a256a346ef9b3c1f9b786d24f0fd4f891f75aba476197f3b155e1aa08ffd0b0a9357604b46bea6b9da34d138ff21bc41a46fa24c7f
-EBUILD epiphany-3.34.4.ebuild 1898 BLAKE2B 9fb4836f9c969a00302b49cc732c26755d60a5b850ef45f9389a7608fdda41535dab8f07e4849439138e382cc144d296af1867091b85e884f6506a5faebb7d0b SHA512 32f9fdaf43113d1808eea899be650de32cbc28ec192769cf1e367d8c43cd46cec7d694b385c4317d75e538672e0b6bd2b757ed9bc30ca2e19da9ac741e49f031
-EBUILD epiphany-3.36.4.ebuild 1890 BLAKE2B 3847f4754a703b465ea0e2c897797846ec8c0840614365e5a9e8714783de5eae518a5e41deb18b5dee369853f63190415aada4faf95cd482b7b3ac21974831b9 SHA512 db55636aa5057a4d30319a8503dfe48a59d556796118534b8e857d3809c4550a0ee58fa1464becf893fda16e7a43ed877be66a8d31d6f3049ef76d985222aaf3
-EBUILD epiphany-40.1.ebuild 1942 BLAKE2B 6637184ca56a32c1b30869729504dcfa02b4e2ea3c74b5377443e286036c9e1aec6e43304a492a5d924ed1e6053faa53b24aaf05ecb124b527895ba77d45e12c SHA512 1c6127cd1f3542c61a3cc839ca21ad1599590dd7f9315c68800824e77ab0bef7a40ab5ce6844190158eb3ada20dafbe4e7d393038cdc9f8094d054e6efa1990b
+EBUILD epiphany-40.1.ebuild 1940 BLAKE2B 0fac9b3f893367358e5fbc3b4ddd8a40526dbed4e2251fc65af7cc5d6446d8508bad30f668c497fff67c08bcdf67d98e33e462e968d144f389839c3362d711c5 SHA512 c359a1d655fae27b0e705c5321c68741a9d2e1b3da691c16df3e9b3fbb959fe2a9420781e32e84f731d3d725958e9208394d2da813c7bf57113b3ba08a6830f1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.34.4.ebuild b/www-client/epiphany/epiphany-3.34.4.ebuild
deleted file mode 100644
index 70cf94888c91..000000000000
--- a/www-client/epiphany/epiphany-3.34.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc64 ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.61.2:2
-	>=x11-libs/gtk+-3.24.0:3
-	>=dev-libs/nettle-3.4:=
-	>=net-libs/webkit-gtk-2.26.0: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.2.4
-	>=dev-libs/libdazzle-3.31.90
-	>=gui-libs/libhandy-0.0.10:0.0=
-	>=x11-libs/libnotify-0.5.1
-	>=app-crypt/libsecret-0.14
-	>=net-libs/libsoup-2.48.0:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	dev-db/sqlite: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
-		# 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-3.36.4.ebuild b/www-client/epiphany/epiphany-3.36.4.ebuild
deleted file mode 100644
index 520f9052c336..000000000000
--- a/www-client/epiphany/epiphany-3.36.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.61.2:2
-	>=x11-libs/gtk+-3.24.0:3
-	>=dev-libs/nettle-3.4:=
-	>=net-libs/webkit-gtk-2.27.4: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.2.4
-	>=dev-libs/libdazzle-3.35.3
-	>=gui-libs/libhandy-0.0.10:0.0=
-	>=x11-libs/libnotify-0.5.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
-	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
-		# 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-40.1.ebuild b/www-client/epiphany/epiphany-40.1.ebuild
index 141d7c77d371..534dc91d2869 100644
--- a/www-client/epiphany/epiphany-40.1.ebuild
+++ b/www-client/epiphany/epiphany-40.1.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
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64.0:2