gentoo resync : 20.03.2022

3 files changed, 3 insertions, 81 deletions

diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 69e03ae34c7e..13e9070deab5 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-contacts-40.0.tar.xz 270412 BLAKE2B 4d7970ac5417dfbd9b0acf51efd8ce1310cee51f90de8d8afa0239d918269642869e35befb64cbfb5acf1bde17ac738192d5ef802d27df47936165b03ed20b51 SHA512 5f9bb7e805cc67a379fd1ab5945774f5067be64d6577bc9cf0514c4ca6b53937555dc96591244d8be418b2b07f7c5401e8186dca5baff3a2b6c5a2ae459a676f
 DIST gnome-contacts-41.0.tar.xz 275248 BLAKE2B c0611a131ce1ebb74b96e96e2e1b9370526b56c49ee43876273fdf5b2f3b333ad2aad85c50ddcebaac85ee8c996037fec3209c6765cab7b37b49ced04a82a7a8 SHA512 310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f
-EBUILD gnome-contacts-40.0.ebuild 1701 BLAKE2B 3eb51627bb2f6c0553f2826082ac53cd53996f438e0dba18d3519dcb1b7872ad9858e6523015d5ad3ac643b0bacb66f64034dd29ceb430756b9ca4c3fc7b21a3 SHA512 61be9e976af8f3dca5ba758d8617ecdc5260a3c18ce7ddb8aa41f1189dfa64eea5c70a73ca1d9d5b12672dc9b33251dc9235aaede657d6f9e80029289abc723e
-EBUILD gnome-contacts-41.0.ebuild 1710 BLAKE2B 61cd5841bbae0dd8592507d7b040f4695b62e3975e247442a2bc2c350de5a15a90184ace20406254ecaaeb99c7e5bd2e0d77845d24149db9fac347c3880978ee SHA512 7f8d8d273d9df9d9584ff02f0f6ab05081138e2a1fe91a949c641315a59b29a7451fb6a7a7085e867f0ad63b7264884263482e0677d28d6ef0776068eac32bd9
+EBUILD gnome-contacts-41.0.ebuild 1707 BLAKE2B b2d3dd5685a8ff16f0df0a0296aea2edae198d72591cd65d040da35e635751df938e66a1a56ec2f50fcb671d34544de24e810506267418b983f23c089b6470dd SHA512 fb4109232b8a992fee3e0db88ba17ae201f7082c092840d71fc4ddadc2291d341101035aa9b44fe191b46be518125fff382904017419bd4e6c345737e7673205
 MISC metadata.xml 326 BLAKE2B 2a56fccc6957b8379b65dafdc5e0893083d0f454785fbd96f3c7695fb16bdbc75db3ece95320549158e227a9e82d84f0ad2144d4ed716647b6433081d36c56d1 SHA512 077fb36f1482d3da1c655d653d693368ba35494429a6c28a64f41f8c37705a5e5a5e49acc3caee6207dd6511cb105d020cc6f17a8b89f8fb4d54a7b26feac1f9
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
deleted file mode 100644
index 55d8856f0982..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="telepathy v4l"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	net-libs/gnome-online-accounts[vala]
-	gnome-extra/evolution-data-server[gtk,vala]
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	>=gui-libs/libhandy-1.1.0:1[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
-	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.23.1:3
-	v4l? ( >=media-video/cheese-3.5.91:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.22 )
-	>=gui-libs/libhandy-1.0.0:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature v4l cheese)
-		$(meson_use telepathy)
-		-Dmanpage=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
index eaa395516ce5..c0f1d80d7643 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)