[gentoo-commits] repo/gentoo:master commit in: app-misc/tracker-miners/files/, app-misc/tracker-miners/

["Mart Raudsepp" <leio@gentoo.org>]

commit:     25033f03396aaf5eb5cac6d9212ac24857dc44d8
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 13:20:33 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 13:21:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25033f03

app-misc/tracker-miners: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 app-misc/tracker-miners/Manifest                   |   1 -
 .../files/2.1.5-libav-build-fix.patch              |  29 --
 .../tracker-miners/files/2.1.5-meson-fixes.patch   | 322 ---------------------
 .../files/2.1.5-rss-symlink-fix1.patch             |  42 ---
 .../files/2.1.5-rss-symlink-fix2.patch             |  39 ---
 app-misc/tracker-miners/files/2.1.5-seccomp.patch  |  42 ---
 app-misc/tracker-miners/files/2.1.5-test-fix.patch |  50 ----
 .../tracker-miners/tracker-miners-2.1.5.ebuild     | 142 ---------
 8 files changed, 667 deletions(-)

diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index b60566f68f5..481551a583d 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,2 +1 @@
-DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605
 DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2

diff --git a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch
deleted file mode 100644
index 580ecb34ba2..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 10 Sep 2018 16:19:20 +0200
-Subject: [PATCH] build: Fix build with libav
-
-The extractor rules defined an array inside an array, which configure_file()
-wouldn't accept.
-
-(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f)
----
- src/tracker-extract/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
-index 9834dc422..bf19f8bac 100644
---- a/src/tracker-extract/meson.build
-+++ b/src/tracker-extract/meson.build
-@@ -60,7 +60,7 @@ if libjpeg.found()
- endif
- 
- if generic_media_handler_name == 'libav'
--  rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']]
-+  rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule']
-   dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep]
-   modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]]
- endif
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch
deleted file mode 100644
index c8a3e6358df..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-From 5bb0709044fabe496601277ab5ba11a03500babe Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 00:15:08 +0200
-Subject: [PATCH 1/5] build: Add feature options for all external deps
-
-Automagic dependencies are bad for distributions. Add feature options
-for all of them that didn't have it before. If no options are specified,
-the behavior matches with before, but now it's possible to specify
-exactly what is linked to and what isn't.
-
-Fixes: #39
----
- meson.build       | 40 +++++++++++++++++++++-------------------
- meson_options.txt | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 58 insertions(+), 19 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fd536f2e6..4f0e9a968 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,4 +1,6 @@
--project('tracker-miners', 'c', 'vala', version: '2.1.5')
-+project('tracker-miners', 'c', 'vala',
-+        version: '2.1.5',
-+        meson_version: '>=0.47')
- 
- gnome = import('gnome')
- i18n = import('i18n')
-@@ -57,9 +59,9 @@ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
- avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
- avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
- dbus = dependency('dbus-1', version: '> 1.3.1')
--exempi = dependency('exempi-2.0', version: '> 2.1.0', required: false)
--flac = dependency('flac', version: '> 1.2.1', required: false)
--gexiv2 = dependency('gexiv2', required: false)
-+exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
-+flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
-+gexiv2 = dependency('gexiv2', required: get_option('raw'))
- gio = dependency('gio-2.0', version: '>' + glib_required)
- gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
- glib = dependency('glib-2.0', version: '>' + glib_required)
-@@ -72,25 +74,25 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
- gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
- icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
- icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
--libcue = dependency('libcue', required: false)
--libexif = dependency('libexif', version: '> 0.6', required: false)
--libgsf = dependency('libgsf-1', version: '> 1.14.24', required: false)
--libgxps = dependency('libgxps', required: false)
--libiptcdata = dependency('libiptcdata', required: false)
--libjpeg = dependency('libjpeg', required: false)
--libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: false)
--libpng = dependency('libpng', version: '> 0.89', required: false)
-+libcue = dependency('libcue', required: get_option('cue'))
-+libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
-+libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
-+libgxps = dependency('libgxps', required: get_option('xps'))
-+libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
-+libjpeg = dependency('libjpeg', required: get_option('jpeg'))
-+libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
-+libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
- libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
--libtiff = dependency('libtiff-4', required: false)
--libxml2 = dependency('libxml-2.0', version: '> 2.6')
--libvorbis = dependency('vorbisfile', version: '> 0.22')
--poppler = dependency('poppler-glib', version: '> 0.16.0', required: false)
--taglib = dependency('taglib_c', version: '> 1.6', required: false)
--totem_plparser = dependency('totem-plparser', required: false)
-+libtiff = dependency('libtiff-4', required: get_option('tiff'))
-+libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
-+libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
-+poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
-+taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
-+totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
- upower = dependency('upower-glib', version: '> 0.9.0', required: false)
- zlib = dependency('zlib')
- 
--libgif = cc.find_library('gif', required: false)
-+libgif = cc.find_library('gif', required: get_option('gif'))
- libmath = cc.find_library('m', required: false)
- 
- # FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid'
-diff --git a/meson_options.txt b/meson_options.txt
-index a91ac6c0f..5fce7a529 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -35,6 +35,43 @@ option('text', type: 'boolean', value: 'true',
- option('unzip_ps_gz_files', type: 'boolean', value: 'true',
-        description: 'Enable extractor for PS.GZ metadata')
- 
-+option('cue', type: 'feature', value: 'auto',
-+       description: 'Support cue sheet parsing')
-+option('exif', type: 'feature', value: 'auto',
-+       description: 'Support EXIF metadata')
-+option('flac', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from Flac audio')
-+option('gif', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from GIF images')
-+option('gsf', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from MS & Open Office documents')
-+option('iptc', type: 'feature', value: 'auto',
-+       description: 'Support IPTC photo metadata')
-+option('iso', type: 'feature', value: 'auto',
-+       description: 'Support ISO image parsing')
-+option('jpeg', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from JPEG images')
-+option('pdf', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from PDF documents')
-+option('playlist', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from playlists (w/ Totem)')
-+option('png', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from PNG images')
-+option('raw', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from RAW photos')
-+option('taglib', type: 'feature', value: 'auto',
-+       description: 'Support writeback for audio files using Taglib')
-+option('tiff', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from TIFF images')
-+option('vorbis', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from Vorbis (ogg/etc) files')
-+option('xml', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from XML and HTML documents')
-+option('xmp', type: 'feature', value: 'auto',
-+       description: 'Support XMP metadata')
-+option('xps', type: 'feature', value: 'auto',
-+       description: 'Support extracting metadata from XPS documents')
-+
- option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto',
-        description: 'Enable upower or HAL for battery/mains power detection')
- option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto',
--- 
-2.17.0
-
-
-From b8c1768696c13275f5896374907fa192140ec922 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 00:18:09 +0200
-Subject: [PATCH 2/5] build: Fix minimum dep checks to allow the specified
- version too
-
-Many of the minimum deps were expressed as "> x.y", but were meant to
-allow x.y itself as well. Change all to ">= x.y". This seems to be
-what was intended and was the case with autotools.
----
- meson.build | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4f0e9a968..4263faf95 100644
---- a/meson.build
-+++ b/meson.build
-@@ -58,38 +58,38 @@ endif
- avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
- avformat = dependency('libavformat', version: '>= 0.8.4', required: false)
- avutil = dependency('libavutil', version: '>= 0.8.4', required: false)
--dbus = dependency('dbus-1', version: '> 1.3.1')
--exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp'))
--flac = dependency('flac', version: '> 1.2.1', required: get_option('flac'))
-+dbus = dependency('dbus-1', version: '>= 1.3.1')
-+exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp'))
-+flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac'))
- gexiv2 = dependency('gexiv2', required: get_option('raw'))
--gio = dependency('gio-2.0', version: '>' + glib_required)
--gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required)
--glib = dependency('glib-2.0', version: '>' + glib_required)
--gmodule = dependency('gmodule-2.0', version: '>' + glib_required)
--gobject = dependency('gobject-2.0', version: '>' + glib_required)
-+gio = dependency('gio-2.0', version: '>=' + glib_required)
-+gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required)
-+glib = dependency('glib-2.0', version: '>=' + glib_required)
-+gmodule = dependency('gmodule-2.0', version: '>=' + glib_required)
-+gobject = dependency('gobject-2.0', version: '>=' + glib_required)
- gstreamer = dependency('gstreamer-1.0', required: false)
- gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false)
- gstreamer_tag = dependency('gstreamer-tag-1.0', required: false)
--gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false)
--gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false)
--icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false)
--icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false)
-+gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false)
-+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false)
-+icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false)
-+icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false)
- libcue = dependency('libcue', required: get_option('cue'))
--libexif = dependency('libexif', version: '> 0.6', required: get_option('exif'))
--libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf'))
-+libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif'))
-+libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf'))
- libgxps = dependency('libgxps', required: get_option('xps'))
- libiptcdata = dependency('libiptcdata', required: get_option('iptc'))
- libjpeg = dependency('libjpeg', required: get_option('jpeg'))
--libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso'))
--libpng = dependency('libpng', version: '> 0.89', required: get_option('png'))
-+libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso'))
-+libpng = dependency('libpng', version: '>= 0.89', required: get_option('png'))
- libseccomp = dependency('libseccomp', version: '>= 2.0', required: false)
- libtiff = dependency('libtiff-4', required: get_option('tiff'))
--libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml'))
--libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis'))
--poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf'))
--taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib'))
-+libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml'))
-+libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis'))
-+poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf'))
-+taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib'))
- totem_plparser = dependency('totem-plparser', required: get_option('playlist'))
--upower = dependency('upower-glib', version: '> 0.9.0', required: false)
-+upower = dependency('upower-glib', version: '>= 0.9.0', required: false)
- zlib = dependency('zlib')
- 
- libgif = cc.find_library('gif', required: get_option('gif'))
-@@ -143,7 +143,7 @@ elif get_option('battery_detection') == 'upower'
- endif
- 
- if battery_detection_library_name == ''
--  hal = dependency('hal', version: '> 0.5', required: false)
-+  hal = dependency('hal', version: '>= 0.5', required: false)
- 
-   if hal.found()
-     battery_detection_library = hal
--- 
-2.17.0
-
-
-From 6a215b9088abb9df4a837c1b74f281454f286ddf Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 01:11:23 +0200
-Subject: [PATCH 3/5] build: Remove unnecessary vala language dependency
-
-tracker-miners doesn't use any vala, but due to vala declared as
-a used language it does error out if valac isn't found. Remove the
-language and unused vapi helper variable.
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 4263faf95..bfd2d624b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,4 +1,4 @@
--project('tracker-miners', 'c', 'vala',
-+project('tracker-miners', 'c',
-         version: '2.1.5',
-         meson_version: '>=0.47')
- 
-@@ -385,7 +385,6 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib
- tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract')
- 
- gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
--vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
- 
- glib_mkenums = find_program('glib-mkenums')
- 
--- 
-2.17.0
-
-
-From a163936b590184291c6ac6b8365eb5f7e9bf3474 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 01:12:25 +0200
-Subject: [PATCH 4/5] build: Remove unnecessary uuid util-linux hard dependency
-
-tracker core might use uuid, but nothing in tracker-miners needs it
----
- meson.build | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index bfd2d624b..8d23a1157 100644
---- a/meson.build
-+++ b/meson.build
-@@ -95,14 +95,6 @@ zlib = dependency('zlib')
- libgif = cc.find_library('gif', required: get_option('gif'))
- libmath = cc.find_library('m', required: false)
- 
--# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid'
--# pkg-config component corresponds to 'libuuid.vapi', but Meson assumes that
--# .vapi name always matches pkg-config name, and will add `--pkg uuid` to the
--# Vala commandline. By finding 'uuid' using find_library() instead, we get
--# a dependency object back that won't cause any `--pkg` arguments to be added
--# to the Vala commandline, but still works as expected for C code.
--uuid = cc.find_library('uuid')
--
- have_tracker_extract = get_option('extract')
- have_tracker_miner_apps = get_option('miner_apps')
- have_tracker_miner_fs = get_option('miner_fs')
--- 
-2.17.0
-
-
-From cc87c22592868e700333f31f333bf850c89f0135 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 7 Oct 2018 23:42:28 +0200
-Subject: [PATCH 5/5] build: Fix breakage when libcue isn't found
-
-Commit 6e281037a5f0abc introduced a regression on systems where libcue
-is not available.
-
-Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33
-
-(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 8d23a1157..d69588435 100644
---- a/meson.build
-+++ b/meson.build
-@@ -303,7 +303,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer')
- conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA')
- conf.set('HAVE_HAL', battery_detection_library_name == 'hal')
- conf.set('HAVE_LIBCUE', libcue.found())
--conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0')
-+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0'))
- conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu')
- conf.set('HAVE_LIBEXIF', libexif.found())
- conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch
deleted file mode 100644
index 9cccb2e36e9..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0d8b3388c415edebc75268358bab4ec2408d5685 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 18 Nov 2018 20:33:51 +0100
-Subject: [PATCH 1/2] meson: Fix bad string comparisons in
- create-miner-symlinks.sh script
-
-This script creates symlinks from $prefix/share/tracker/miners to the
-real D-Bus .service files, which usually live in /usr/share/dbus-1.
-
-The script was comparing strings incorrectly, leading to misbehaviour.
-
-See https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
-
-(cherry picked from commit 949e7003c7027a9946b751c73e1e030d35c78bd7)
----
- src/create-miner-symlinks.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
-index 114cc54c8..9d8ded2fb 100644
---- a/src/create-miner-symlinks.sh
-+++ b/src/create-miner-symlinks.sh
-@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
- have_tracker_miner_rss="$5"
- 
- mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
--if [[ "$have_tracker_miner_apps" -eq "true" ]]; then
-+if [[ "$have_tracker_miner_apps" == "true" ]]; then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
--if [[ "$have_tracker_miner_fs" -eq "true" ]]; then
-+if [[ "$have_tracker_miner_fs" == "true" ]]; then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--if [[ "$have_tracker_miner_rss" -eq "true" ]]; then
-+if [[ "$have_tracker_miner_rss" == "true" ]]; then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch
deleted file mode 100644
index 30fef51ca49..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 191a67bae395eab322f1adc000c95d35b1a60c71 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbicha@ubuntu.com>
-Date: Sun, 18 Nov 2018 16:42:53 -0500
-Subject: [PATCH 2/2] meson: fix bashism in equality check
-
-Thanks https://rgeissert.blogspot.com/2012/12/a-bashism-week-testing-for-equality.html
-
-and checkbashisms from Debian's devscripts
-
-Closes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/38
-(cherry picked from commit 0304f28a9963bff0c5b029d88dc36f91f53dcf65)
----
- src/create-miner-symlinks.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
-index 9d8ded2fb..3ed270bca 100644
---- a/src/create-miner-symlinks.sh
-+++ b/src/create-miner-symlinks.sh
-@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4"
- have_tracker_miner_rss="$5"
- 
- mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
--if [[ "$have_tracker_miner_apps" == "true" ]]; then
-+if ([ "$have_tracker_miner_apps" = "true" ]); then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/"
--if [[ "$have_tracker_miner_fs" == "true" ]]; then
-+if ([ "$have_tracker_miner_fs" = "true" ]); then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--if [[ "$have_tracker_miner_rss" == "true" ]]; then
-+if ([ "$have_tracker_miner_rss" = "true" ]); then
-   ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/"
- fi
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch
deleted file mode 100644
index f32d698a487..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-seccomp.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 21:11:29 +0200
-Subject: [PATCH] build: Only require seccomp when the CPU architecture
- supports it
-
----
- meson.build | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index ef48e77a6..65ad19cad 100644
---- a/meson.build
-+++ b/meson.build
-@@ -261,7 +261,23 @@ endif
- # Check for libseccomp
- ##################################################################
- 
--if not libseccomp.found() and host_machine.system() == 'linux'
-+host_system = host_machine.system()
-+host_cpu = host_machine.cpu()
-+unsupported_cpus = [
-+  'alpha',
-+  'ia64',
-+  'm68k',
-+  'parisc',
-+  'parisc64',
-+  'sh4',
-+  'sparc',
-+  'sparc64',
-+]
-+system_supports_seccomp = host_system == 'linux'
-+cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu)
-+seccomp_required = system_supports_seccomp and cpu_supports_seccomp
-+
-+if not libseccomp.found() and seccomp_required
-   error('Libseccomp is mandatory for sandboxed metadata extraction')
- endif
- 
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/files/2.1.5-test-fix.patch b/app-misc/tracker-miners/files/2.1.5-test-fix.patch
deleted file mode 100644
index be979e6af05..00000000000
--- a/app-misc/tracker-miners/files/2.1.5-test-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 02a54749117d609d75bad80331024661c2e598ce Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 15 Feb 2019 12:20:39 +0200
-Subject: [PATCH] libtracker-miners-common: improve path_evaluate_name
- environment handling
-
-Under some environments $PWD might not point where we expect, so simply
-use g_get_current_dir() instead.
-g_getenv() is documented to return a pointer that may get overwritten
-by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after
-removing the second g_getenv, there's still g_setenv calls, take a copy.
----
- .../libtracker-miners-common/tracker-file-utils-test.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/tests/libtracker-miners-common/tracker-file-utils-test.c b/tests/libtracker-miners-common/tracker-file-utils-test.c
-index 93b94472c..3f86a0cdc 100644
---- a/tests/libtracker-miners-common/tracker-file-utils-test.c
-+++ b/tests/libtracker-miners-common/tracker-file-utils-test.c
-@@ -134,14 +134,14 @@ test_path_list_filter_duplicates_with_exceptions ()
- static void
- test_path_evaluate_name (void)
- {
--	gchar *result, *expected;
--
--	const gchar *home = g_getenv ("HOME");
--	const gchar *pwd = g_getenv ("PWD");
-+	gchar *result, *expected, *home, *pwd;
- 
- 	const gchar *test = "/one/two";
- 	gchar *parent_dir;
- 
-+	home = g_strdup (g_getenv ("HOME"));
-+	pwd = g_get_current_dir ();
-+
- 	g_setenv ("TEST_TRACKER_DIR", test, TRUE);
- 
- 
-@@ -219,6 +219,8 @@ test_path_evaluate_name (void)
- 	result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ());
- 	g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ());
- 
-+	g_free (home);
-+	g_free (pwd);
- 	g_unsetenv ("TEST_TRACKER_DIR");
- }
- 
--- 
-2.17.0
-

diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
deleted file mode 100644
index b04c2c5f8c6..00000000000
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	>=app-misc/tracker-2.1.0:=
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	!gstreamer? (
-		ffmpeg? (
-			libav? ( media-video/libav:0= )
-			!libav? ( media-video/ffmpeg:0= ) ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	flac? ( >=media-libs/flac-1.2.1 )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	pdf? ( >=app-text/poppler-0.16.0[cairo] )
-	taglib? ( >=media-libs/taglib-1.6 )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29)
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49
-	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50
-	"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51
-	"${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6
-	"${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Ddocs=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		-Dminer_apps=true
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Ddvi=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		-Dcue=$(usex cue enabled disabled)
-		-Dexif=$(usex exif enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dgif=$(usex gif enabled disabled)
-		-Dgsf=$(usex gsf enabled disabled)
-		-Diptc=$(usex iptc enabled disabled)
-		-Diso=$(usex iso enabled disabled)
-		-Djpeg=$(usex jpeg enabled disabled)
-		-Dpdf=$(usex pdf enabled disabled)
-		-Dplaylist=$(usex playlist enabled disabled)
-		-Dpng=enabled
-		-Draw=$(usex raw enabled disabled)
-		-Dtaglib=$(usex taglib enabled disabled)
-		-Dtiff=$(usex tiff enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dxml=$(usex xml enabled disabled)
-		-Dxmp=$(usex xmp enabled disabled)
-		-Dxps=$(usex xps enabled disabled)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}