gentoo resync : 13.06.2020

3 files changed, 2 insertions, 107 deletions

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index e02e742cb4d5..ff1399807173 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,5 +1,3 @@
-DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
 DIST tracker-2.3.4.tar.xz 1607928 BLAKE2B f0285480091fdac3aab1d258496643b7644f2d58383eb0d7cdd10f273a79e75a36507285db4737bb270dda8cb195482d6f8e2770b24fce13c72dd32325c3976e SHA512 8b8ffc33962a5dffbae83dfb8ea73b0d2ff6ee002fbd9e4b574ef5f8e562338e359caab290ab804f2801a14e04d2c76eb0a52cf06be4d236ea043de4fc39dadf
-EBUILD tracker-2.2.2.ebuild 2590 BLAKE2B a50bac85eb9d02d14428ccc3a2f596a95c180c980ade8c51b1aae5669db2c19810bbdf080a2a02e8ed35bbeb24d847740de58595f10eda5c8874ebf3e90cf9a2 SHA512 5d4ff9bd28033bc3f7070a884516cfa0eadb984398513eae597d227d75222e18bb68e8248caadf5ec1ac7743bc18678a6df80c777f364e7cda918b1b4279cdea
-EBUILD tracker-2.3.4.ebuild 2593 BLAKE2B fe6f7e43678ae5e7e08cdfc418c4b93bec966f875e07dc498f8c202eb09824ea336d8135f1188f78019cbc089acf0533e5f05dfb64bf8aa84240bbd6c79e2ac7 SHA512 7b87843b7b980a3d5f4424d03c0198d17b57dbac7c0482640f044f3786f94064f16f8d01aa5093cec46da7d638760367dac3e4c955092d8308b2e7cd58f487b4
+EBUILD tracker-2.3.4.ebuild 2592 BLAKE2B 2a5c66824cf6405495f2facaf0d8c30eeee6b2d7993fc5ccaf69949fb9c5ff0a4070587932d52a94303707cd7d3d6ceb04196c1bc536a9f510f74204a408159e SHA512 8c23b0ad1c7b7aca2399a6fd84a25d6f03bf507e45253042c5e0958321cd876af3c8359d5f7dc48cc7503b39b31c867a6a182a5d9aba9e262318eac177e4b744
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.2.2.ebuild b/app-misc/tracker/tracker-2.2.2.ebuild
deleted file mode 100644
index eed86681854f..000000000000
--- a/app-misc/tracker/tracker-2.2.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0"
-IUSE="gtk-doc +miners networkmanager stemmer"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-#RESTRICT="!test? ( test )"
-
-PV_SERIES=$(ver_cut 1-2)
-
-# In 2.2.0 util-linux should only be necessary if glib is older than 2.52 at compile-time
-# But build still needs it - https://gitlab.gnome.org/GNOME/tracker/issues/131
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.0
-	>=net-libs/libsoup-2.40.1:2.4
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.20.0
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	$(vala_depend)
-	gtk-doc? ( >=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dfts=true
-		-Dfunctional_tests=false # many fail in 2.2; retry with 2.3
-		#$(meson_use test functional_tests)
-		-Dman=true
-		$(meson_feature networkmanager network_manager)
-		$(meson_feature stemmer)
-		-Dunicode_support=icu
-		-Dbash_completion="$(get_bashcompdir)"
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/tracker-2.3.4.ebuild b/app-misc/tracker/tracker-2.3.4.ebuild
index 49070be66e48..cb4efce3cb78 100644
--- a/app-misc/tracker/tracker-2.3.4.ebuild
+++ b/app-misc/tracker/tracker-2.3.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 #RESTRICT="!test? ( test )"
 
 PV_SERIES=$(ver_cut 1-2)