From dc3f289f33ded05752ef49e0f5186e0ed0e6e531 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 20 Apr 2020 23:24:06 +0300
Subject: [PATCH] dev-libs/folks: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---
 dev-libs/folks/Manifest                       |  1 -
 .../files/0.12.1-conditional-tests.patch      | 40 ---------
 .../files/0.12.1-meson-0.53-compat.patch      | 47 ----------
 .../files/0.12.1-meson-0.53-compat2.patch     | 31 -------
 .../folks/files/0.12.1-no-tracker-tests.patch | 26 ------
 dev-libs/folks/folks-0.12.1-r1.ebuild         | 89 ------------------
 dev-libs/folks/folks-0.12.1.ebuild            | 90 -------------------
 7 files changed, 324 deletions(-)
 delete mode 100644 dev-libs/folks/files/0.12.1-conditional-tests.patch
 delete mode 100644 dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
 delete mode 100644 dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
 delete mode 100644 dev-libs/folks/files/0.12.1-no-tracker-tests.patch
 delete mode 100644 dev-libs/folks/folks-0.12.1-r1.ebuild
 delete mode 100644 dev-libs/folks/folks-0.12.1.ebuild

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 7b6fbc09eb53..08bba6a984ab 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,2 +1 @@
-DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
 DIST folks-0.13.1.tar.xz 515584 BLAKE2B fe4e368e60dd41a72f449f130993eb7b8792b2a38218ff7117a8e5ec192d53d2b8f5ab09a2318267cf2fd7a717048b8715289b2f411c59846c6c98235ec32149 SHA512 b134172077bed1655cd7f24b1402ed347d405b22114c33d6638040a5e475632ea33cde898a08fc143eaefc7057d4b6dccceac7e797e1976fdf88c58764818afe
diff --git a/dev-libs/folks/files/0.12.1-conditional-tests.patch b/dev-libs/folks/files/0.12.1-conditional-tests.patch
deleted file mode 100644
index cde0847fe146..000000000000
--- a/dev-libs/folks/files/0.12.1-conditional-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 93c03b9582eb1eac21f084decf86ca5f1340dc53 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 7 Sep 2019 22:16:43 +0300
-Subject: [PATCH] meson: Allow disabling build of tests
-
----
- meson.build       | 4 +++-
- meson_options.txt | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 91800654..37e6b5c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -219,7 +219,9 @@ subdir('tools')
- subdir('po')
- 
- # Tests
--subdir('tests')
-+if get_option('test')
-+  subdir('tests')
-+endif
- 
- if docs_enabled
-   subdir('docs')
-diff --git a/meson_options.txt b/meson_options.txt
-index 042a72e8..b4552d49 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -9,6 +9,7 @@ option('zeitgeist', type: 'boolean', value: false, description: 'build Zeitgeist
- option('import_tool', type: 'boolean', value: true, description: 'Enable building the meta-contact import tool')
- option('inspect_tool', type: 'boolean', value: true, description: 'Enable building the data inspection tool')
- # Test options
-+option('test', type: 'boolean', value: true, description: 'Build test programs')
- option('installed_tests', type: 'boolean', value: false, description: 'Install test programs')
- # Docs
- option('docs', type: 'boolean', value: false, description: 'Enable documentation generation')
--- 
-2.20.1
-
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
deleted file mode 100644
index 56f9543ba40a..000000000000
--- a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Mon, 3 Feb 2020 08:57:52 +0100
-Subject: [PATCH] meson: Use python.dependency() correctly
-
-From https://github.com/mesonbuild/meson/issues/6470:
-
-> So, to further clarify, passing an argument to
-> py_installation.dependency() should be an error, since this method
-> will only ever return a python dependency (for embedding python
-> itself, etc.) and not dbusmock or anything else.
-
-Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119
----
- meson.build | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d5115e28..f3644457 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,7 +1,7 @@
- project('folks', [ 'vala', 'c' ],
-   version: '0.13.2',
-   license: 'LGPL2.1+',
--  meson_version: '>= 0.49',
-+  meson_version: '>= 0.51',
- )
- 
- gnome = import('gnome')
-@@ -132,8 +132,11 @@ if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
-   # Needed for the BlueZ tests
-   pymod = import('python')
--  py_installation = pymod.find_installation('python3')
--  python_dbusmock = py_installation.dependency('dbusmock')
-+  py_installation = pymod.find_installation('python3',
-+    modules: [
-+      'dbusmock',
-+    ],
-+  )
- endif
- 
- if import_tool_enabled
--- 
-2.20.1
-
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
deleted file mode 100644
index 40c3ca601f05..000000000000
--- a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 23 Feb 2020 19:28:51 +0200
-Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built
-
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 74320634..64f28d2b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -131,12 +131,14 @@ endif
- if bluez_backend_enabled
-   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
-   # Needed for the BlueZ tests
-+  if get_option('test')
-   pymod = import('python')
-   py_installation = pymod.find_installation('python3',
-     modules: [
-       'dbusmock',
-     ],
-   )
-+  endif
- endif
- 
- if import_tool_enabled
--- 
-2.20.1
-
diff --git a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch b/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
deleted file mode 100644
index 3dbfadf7452e..000000000000
--- a/dev-libs/folks/files/0.12.1-no-tracker-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b2b0832cf69560bdf0692d275d49d4ed6e293426 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 7 Sep 2019 22:26:38 +0300
-Subject: [PATCH] tests: disable failing tracker tests
-
-All tracker tests fail for me, so disable them for now to at least
-continue testing the rest.
----
- tests/meson.build | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 6a7fa29c..2079051b 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -43,7 +43,3 @@ endif
- if eds_backend_enabled
-   subdir('eds')
- endif
--
--if tracker_backend_enabled
--  subdir('tracker')
--endif
--- 
-2.20.1
-
diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild
deleted file mode 100644
index 3ac62a655ba7..000000000000
--- a/dev-libs/folks/folks-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with v0.12.1
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9 )
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=
-		<gnome-extra/evolution-data-server-3.33
-	)
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( sys-apps/dbus
-		bluetooth? ( dev-python/dbusmock ) )
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled
-	"${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removes them for now
-	"${FILESDIR}"/${PV}-meson-0.53-compat.patch # https://gitlab.gnome.org/GNOME/folks/issues/119
-	"${FILESDIR}"/${PV}-meson-0.53-compat2.patch # Don't require dbusmock if tests aren't built (with our downstream conditional-tests patch)
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		-Dlibsocialweb_backend=false # not packaged
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
deleted file mode 100644
index 95be628d2bca..000000000000
--- a/dev-libs/folks/folks-0.12.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with v0.12.1
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(vala_depend)
-	>=dev-libs/glib-2.44:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-	tracker? ( app-misc/tracker:0/2.0 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala]
-		<gnome-extra/evolution-data-server-3.33
-	)
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	>=dev-util/meson-0.49
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
-	test? ( sys-apps/dbus
-		bluetooth? ( dev-python/dbusmock ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled
-	"${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removed them for now
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		-Dlibsocialweb_backend=false # not packaged
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		$(meson_use tracker tracker_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-- 
2.26.2