gentoo resync : 31.05.2021

3 files changed, 2 insertions, 78 deletions

diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 1bcd2a2fbb2a..565b3776302f 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-contacts-3.38.1.tar.xz 657376 BLAKE2B 5c042566ad99be1bda454466dcc2a42d6494cfbfb5a9f60eb0fa718a8d9bcbb986798ec48a87d5d322989b22d0fac2eee69df852ae39ba8a228ad91f50247c30 SHA512 bc2ed06d491c4773b9cedb2c51dc390a95d0271cf22d54864f5da4d892f80efece3cbdc1b90b4497f730039c8c83065b2a0ca590cecec579f011dd324ff8f134
 DIST gnome-contacts-40.0.tar.xz 270412 BLAKE2B 4d7970ac5417dfbd9b0acf51efd8ce1310cee51f90de8d8afa0239d918269642869e35befb64cbfb5acf1bde17ac738192d5ef802d27df47936165b03ed20b51 SHA512 5f9bb7e805cc67a379fd1ab5945774f5067be64d6577bc9cf0514c4ca6b53937555dc96591244d8be418b2b07f7c5401e8186dca5baff3a2b6c5a2ae459a676f
-EBUILD gnome-contacts-3.38.1.ebuild 1638 BLAKE2B 13ecf49290a796cbf04b66c01b702a311543f82c53021444088a51517bf8ba399eac9792e549f25e68f3acf480790271a029cade29f940ce418070f26af4fe4b SHA512 a83e01f87b803a5e258d449b6fcf01591e79560180355d8f89b490e270095cd44a676ab6eaba45fa63e8429ad3012cd786c8b484be6dcd67bab2baa9bd7002ae
-EBUILD gnome-contacts-40.0.ebuild 1703 BLAKE2B fe91ca45d0e6e629eb77f802f880ae0e74bc5a3b5e6c5d2787ad2f18060a1c78ead87143ad0728c3a75b8cca9623f07fe9810edc0a47a74e48e88246f5b04494 SHA512 81747627e73d7da2c7c8c3da6a5ab82def82d67af5adbf5ed9a2a74118e67dc6276291c4d28264e5efb9dac11769de972d710e6b5002fb4e1815dca395d1f0e8
+EBUILD gnome-contacts-40.0.ebuild 1701 BLAKE2B 3eb51627bb2f6c0553f2826082ac53cd53996f438e0dba18d3519dcb1b7872ad9858e6523015d5ad3ac643b0bacb66f64034dd29ceb430756b9ca4c3fc7b21a3 SHA512 61be9e976af8f3dca5ba758d8617ecdc5260a3c18ce7ddb8aa41f1189dfa64eea5c70a73ca1d9d5b12672dc9b33251dc9235aaede657d6f9e80029289abc723e
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
deleted file mode 100644
index 3a32c93b4bec..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson 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.0.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="
-	${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-40.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
index 7cf6f2b6d3a1..55d8856f0982 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)