gentoo resync : 20.03.2022

3 files changed, 2 insertions, 100 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 1e653d55b949..d03e4d5bf67b 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,3 @@
-DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
 DIST folks-0.15.4.tar.xz 493004 BLAKE2B 0e067a39b4e89e8fa41b20f37c774e56fcb1e0c8de23798ced647177b0d9329509ae3c03ff85a00464887deb4ce275c96b2fcf50aa2dd44af02e20b6ee45fe65 SHA512 4dbd0bb82d56a8cb179ab8148ce531817ccd55bd40f8b562eb0d77555b264e5190669b356ff009c81a963fdcacaabc02fe871bf0c3c668a648f2c820da76f25c
-EBUILD folks-0.15.3.ebuild 2349 BLAKE2B 213e515feb14d84974725e90dcb996858bcde38b6a09bada63749f37e7101f872628f6e0a9674a71342aca6ff2471774be3df5573d23dfaa4da0bdd6600e1dcd SHA512 b85cb48350c0a8bd11d016ef2c87d6da1fec68653770ddf05a6c7a7019543c7d0f86948fde7224c0c1bcf9d106361709ca5e2b43c593df341f52f4b74bd808fc
-EBUILD folks-0.15.4.ebuild 2351 BLAKE2B 383302043f5b46855941fb0d9147bea76af943f6c8011ff9bf825753857e40950f9966b1bacf4b0c3ffe79a2146d2c0431d98cda07a4c6a8da9e43e7b0258b5c SHA512 32b67a3c72f320390f5991aaf24109b25f2263866e3b24fd02b92f0b38de034dd1eb2f1a7a419b26fa93ccbd18e2102adc8ded0f91e173f5834a4e1a1d7bdbc1
+EBUILD folks-0.15.4.ebuild 2348 BLAKE2B 2a6b299326aa74168affff44885f41d61895e91b6c9785a89973abd6c17cd458248cf7e5a956be272bc8181cc68dca44984fd6a2534b402b52356ee85825c7ab SHA512 e0b5a04ee0215820366a79dac1acac2003c17241f0880dbbbc25c6731d065168783812bbd9feea2a1268c462910d367eccdf6671760a6aa7af7298eb78077f73
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.3.ebuild b/dev-libs/folks/folks-0.15.3.ebuild
deleted file mode 100644
index ab69961fd1bc..000000000000
--- a/dev-libs/folks/folks-0.15.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
-	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="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			$(python_gen_any_dep '
-				dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" -t 5
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.15.4.ebuild b/dev-libs/folks/folks-0.15.4.ebuild
index 7d90012d5b65..5ab4cc617b40 100644
--- a/dev-libs/folks/folks-0.15.4.ebuild
+++ b/dev-libs/folks/folks-0.15.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"