Merge branch 'edge' into next

3 files changed, 0 insertions, 109 deletions

diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 76013aa75dea..f66817a48862 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,8 +1,5 @@
-AUX 3.32.1-libhandy-0.0.10-compat.patch 918 BLAKE2B 53fceb62485c109623815a4087743a4e56c7ebba53ca780a67e8bd2d7e645efe7ec42cf45a38dd32fc042fa463d033bed796ca96d0a246d4eb8c4f5d9a88a6a4 SHA512 4f77e953b7ccd818f0347d470690a92906b045c4de129428db6a4fa211882d7e9f6e8956ec65a7ae66e9190551fe36ceb64476e62ab91e6755b93cca1b88f02d
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
-DIST gnome-contacts-3.32.1.tar.xz 358800 BLAKE2B a3cdc58948b994868a18e74dd2ab1a1ffea04b84da95347f19b79b49a7eb9363589e08e11e8fa2f588c5833592be3149ea435b6036a376d4c9e1477d0d308e96 SHA512 25fc4835c61bd5f195512fd304955058e1178cbafaff09a6bbfffc58840876f514ebc3119247925266a9c10f8fc452511a055d84aa1e815571188aba7212fe71
 DIST gnome-contacts-3.34.1.tar.xz 365384 BLAKE2B 3563ce0784c19b2cf61e3cad60afaeaa310c53c68f11da459a3053df6be769fe0bdfea84f106e11fd2921c3f6bf8ef6a03b8cd90a680dc5b46d9a0486fd0c737 SHA512 6dad3fd9d199ad87c642e9f36102a142958cd3f577eba36fa3ed2800af5acb44752fa1f8b7eb8991974c514245af51015e6b5e08636274b9048813c37abcc478
 EBUILD gnome-contacts-3.30.2.ebuild 1529 BLAKE2B 728a5e3fbf49c1153308e26bcd0b541c5168490d20419444c43fc0c709c138510eced523ba90c156df92d60f9d6cbb61e80833a274a096e0fcb252652c80725b SHA512 cfe781f150533677bfa9fd55b45af28eede8241b35ee5039a5e3ae19eac3306200e8d31c8af69ec918c002ca0400ae1730ba39e3994ce8badbb15c0aacc1b099
-EBUILD gnome-contacts-3.32.1.ebuild 1696 BLAKE2B c9527baadb26c0b4e8b4d5ef25259b752e9b5a7dbce0470e3b440dd4e1e4a82a7ac2343e4440d2edaf2a66fa9415716c79bf2a33625d8d390295b7298eeef3ef SHA512 e50e26a19bad02c901339a13ed3b76848d42d8e9f4668cccd8121576603fb61aa6a0d36340794ab50af2144a7827ff8e308ef57ec4883346eee1823e16d2e4fa
 EBUILD gnome-contacts-3.34.1.ebuild 1606 BLAKE2B f59f4be7af2ec1b898ab05debad82d058c75173765c33b6e8377c50acfdf80a8d0bad238313faad22de1bb1e41acec3476e69fed017b945cd50585129069754a SHA512 202d0a52f6725fe2a6063cc608ecb262acb6a9db626562f5f0e361b3566ad4722faa1878dfae2a320ec8bb5a04e497378fbfa8cbc0671a693643cebbb12937a1
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch b/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch
deleted file mode 100644
index 00eff6c686f2..000000000000
--- a/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c5eee38cd2556403a640a0a4c11d36cbf9a5a798 Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Thu, 30 May 2019 14:30:54 +0200
-Subject: [PATCH] window: Disambiguate Gtk.HeaderBar
-
-Apparently libhandy also added a HeaderBar type, which means this
-clashes with that of Gtk.
----
- src/contacts-window.vala | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/contacts-window.vala b/src/contacts-window.vala
-index 738228d..49f6995 100644
---- a/src/contacts-window.vala
-+++ b/src/contacts-window.vala
-@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow {
-   [GtkChild]
-   private TitleBar titlebar;
-   [GtkChild]
--  private HeaderBar left_header;
-+  private Gtk.HeaderBar left_header;
-   [GtkChild]
--  private HeaderBar right_header;
-+  private Gtk.HeaderBar right_header;
-   [GtkChild]
-   private Overlay notification_overlay;
-   [GtkChild]
--- 
-2.20.1
-
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
deleted file mode 100644
index c8e2bc7791a2..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~arm64 ~ppc ~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:0.0[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
-	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
-	>=dev-libs/glib-2.44: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-0.0.9:0.0=
-"
-DEPEND="${RDEPEND}
-	${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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-libhandy-0.0.10-compat.patch # compatibility with libhandy-0.0.10+
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use 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
-}