gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /app-misc
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
44 files changed, 373 insertions, 939 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e6021551bd3f..bebe6941c4ed 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index f42673750293..f50dcfe22bd3 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,3 +1,5 @@
 DIST asciinema-2.0.1.tar.gz 48597 BLAKE2B 9179d19c3c6980f35004145fc109dfa938fa020e1982389f7309c7716f8e18914fb8db46e74b2d778b043399d00a3348e499e9fc1849f5f02e1a729c8bde6084 SHA512 abc7e2a83032520d42b45524fbd103bd974b6857274fbb923b274d11f0a81a8d06cd1e97f1b7d6432a47e1ded6df5e37e52c69caaf7f15b1bf8b53f17dfc07d1
+DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
 EBUILD asciinema-2.0.1.ebuild 715 BLAKE2B 527c1dd6251ecf999f613409adc0da06eebdf08a12b01dff5030694e57fab13b03d385283bdd654d9522f8bdf566d4b2af54e9b95bbedb3df553e985c211cb41 SHA512 a7932f629ff6472e905931fd246702d1f308229962e93acabb48589426bf852423ab7ebe763d528581096434fa68f387d5262b918087e6aa1a525eb20ba3a085
+EBUILD asciinema-2.0.2.ebuild 712 BLAKE2B f3933813b9f7d0d25c13172bce141cc2a1b02b31319780a51b112574156ca386bba7c9c326258f495d024f4b354a688da36e04c226f63795b625c2c7004201fd SHA512 d7f62def4f26068bf8432295ff238accd1a7d70da1eed2d59925fd4971c72b4dec58f8d1543f3d516a3f73be2feed3c4b946ca88ffc4e5ec0a962462ebe28451
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.2.ebuild b/app-misc/asciinema/asciinema-2.0.2.ebuild
new file mode 100644
index 000000000000..a44b1367cd19
--- /dev/null
+++ b/app-misc/asciinema/asciinema-2.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Command line recorder for asciinema.org service"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i -e "s|data_files=\[('share/doc/asciinema|&-${PVR}|" setup.py || die
+}
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 2ff09f844285..8ed1d61f1358 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,5 @@
 DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9
 DIST bijiben-3.26.2.tar.xz 865148 BLAKE2B 77bb78745295d414153e18491fd16faad29defabaff4ad979db7cc6e6fe075e042dd8b04d321282fbfbf163541818019bc2cbda0f8562010dfc32f275f3f54e8 SHA512 1db8c5e605b5c6a0fcd8743365a53b6ab2d986a18d501a3f02e892bcfc8ba91e9ca933b6f2a4318f71724b40f190d0ebc18eabfe1332de6765b9bca09d36718e
-EBUILD bijiben-3.26.1.ebuild 687 BLAKE2B fcf3074dbbd8d75d92d6c58ffdf3aaab8607a4d6b97ebff1b66aa64070c6e25dcc143848714003dc38af6ec8a96e3b0de451e0d7cc6eaeb2fe544c495d5b06ff SHA512 1d3e258e55e47849833a356992e9923c700c8e71c6ba6dbb14b74067003b093409c038e508294846b33e7cf33f3349c2a15d1bf85f33052c3ddcee77f8ccdbd8
-EBUILD bijiben-3.26.2.ebuild 685 BLAKE2B d60c0e8d62182ab54dc21b315f115a8cb13e3bec563d1fc2e74db947e3aeff22997614c416a750188e7c6a854b9886d1ff21a77334d5f5664306dbde1f95ffa1 SHA512 7e3bf009eee9d82add56455cad1c6bf2ad430af49ccc86578206446859b9385c9d9cbf2a0c9c3ba07430f740f2ec21a46791741df6eccfe1704ae15ebbae7450
+EBUILD bijiben-3.26.1.ebuild 708 BLAKE2B ac47bec8f3827f1fdd307de3b2ef447572cee4902e42cb00f850d609ad3579197f81113795a5e043f7a5a21193c166a3465dd0178f059e90fcda7076659cce60 SHA512 525c17f986bb609e8e7efc51faee217ac1799ecfbb8afb5681c9f0e40f12dd22e32ae195d851e6f57a4d35c342465c13d1a72d9ef9341ebba984169162c021b4
+EBUILD bijiben-3.26.2.ebuild 706 BLAKE2B ae99e9d85fe53259ed2f787c92435af2faff6dcd3f8a137737ea4fcc924a9f9c96e363e252efd2e78b407983acc2efde12eaf649a4bfa8e1c61879b45632ea1c SHA512 ffac3a15b9cd477bb0c86c76aa71fa922fb8afcda7bd89ea92e994c0b086a9c6e2b5e3c014f79b855c6b88410797a824017eaaf9514cc21cb0190d6815a14cc3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.26.1.ebuild b/app-misc/bijiben/bijiben-3.26.1.ebuild
index f5a86b813fd3..c49fe03f0585 100644
--- a/app-misc/bijiben/bijiben-3.26.1.ebuild
+++ b/app-misc/bijiben/bijiben-3.26.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/appstream-glib
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	dev-util/itstool
 	sys-devel/gettext
diff --git a/app-misc/bijiben/bijiben-3.26.2.ebuild b/app-misc/bijiben/bijiben-3.26.2.ebuild
index f6d4902983e9..e7fb0fc38f9f 100644
--- a/app-misc/bijiben/bijiben-3.26.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.26.2.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/appstream-glib
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	dev-util/itstool
 	sys-devel/gettext
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 192ff2b155fd..53ec83c5f57d 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,10 +2,10 @@ AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e5604002
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4
 DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879
 DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00
-EBUILD carbon-c-relay-3.2.ebuild 941 BLAKE2B 08b97db03e44cc14b3b1d3d8f8a5acfb9c23d7dead00c2e1c3088b524e5f19865e8599e915d1b84c7ed7414c66cc1c75dba20ba467b8b4d8b34aa69f942f7e22 SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85
+DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
 EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
 EBUILD carbon-c-relay-3.4.ebuild 1524 BLAKE2B 2a8981118520787f99095b5675c0b7a8796254fefb7c6060ef7433fc6b0e21b2688fbe6d87a43018efead41ff2ebe7c1d0e1e2ca296a7e5f1a9cf2f59bbca275 SHA512 d5245f24d09c3f352ad2aece0052744e74fae3b312313122b43d999453391a767a9ecca9265ec0f743f60e7dbbd9843de02454c7a4e2419daffa478f750897e5
+EBUILD carbon-c-relay-3.5.ebuild 1524 BLAKE2B 550a8f03ebb9db123c73bcfff8f34030faa8d14c3864325d324043e85b6690eeed21ef17bbb00c86ae3c846a7e84b4853f840ed72afdefa2ee4b9aa62c7833f0 SHA512 248b32b60392dd7648b8301c8474fc21dba7f35a2336497487968905d9884fa088e13189ae8d285242c69c103b44ad47689bf1f070531976b7603b36ac051b1d
 MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
index b90690b8cff7..4c796fdadaa2 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,21 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="lz4 ssl zlib"
-
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
+
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
+# unforunately pcre is in global USE, so we have to exclude that here
+REQUIRED_USE="
+	pcre2?     ( !oniguruma )
+	oniguruma? ( !pcre2 )
+"
 RDEPEND="lz4? ( app-arch/lz4 )
+	snappy? ( app-arch/snappy )
+	zlib? ( app-arch/gzip )
 	ssl? ( dev-libs/openssl:0 )
-	zlib? ( app-arch/gzip )"
+	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
+	pcre2? ( dev-libs/libpcre2 )
+	oniguruma? ( dev-libs/oniguruma )"
 DEPEND="${RDEPEND}"
 
 pkg_preinst() {
@@ -25,7 +35,16 @@ pkg_preinst() {
 }
 
 src_configure() {
-	econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip)
+	local pcrecfg
+	if use !pcre2 && use !oniguruma ; then
+		pcrecfg=$(use_with pcre)
+	else
+		pcrecfg="--without-pcre"
+	fi
+
+	econf $(use_with lz4) $(use_with snappy) \
+		$(use_with ssl) $(use_with zlib gzip) \
+		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
 }
 
 src_install() {
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index fa0e1cde01ed..c56c68d6a03f 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -5,5 +5,5 @@ DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce
 EBUILD ddcutil-0.8.4.ebuild 2948 BLAKE2B 17189cad5f87ec5f58dfbf9ff4b65edb2acc61a21b5ed7189d48a1e97794e2b2fe4f9493a91e01295200d5a5afb124d2a7bdd6f3eb4ff3d3cc474347a3bad833 SHA512 1a557b9d80cbb683ada7621876be9ad6b5f72d7227a28f292811d4c6460aba95a107dd58e9952d2c139255b1b530c04d5e4f7f09175b7871a0bd3ac593cacfb5
 EBUILD ddcutil-0.8.6-r1.ebuild 2729 BLAKE2B 0fd422fd07caeb03c144e31767ed77e707a6f25c63872e06030d12715bde8d39d9425d2e4fe5f2e5a97aad073b9d8e445f97d60e18c80d52e4aae7fb8399812e SHA512 e3dc3ff5d24f50147670e36cc68aa6ee96e2d79329a023ff7c6624b3de090018812f0a4e25cb39f5200eb7a420e3906afa6fe089d505dcd08806c1d75fbfe03a
 EBUILD ddcutil-0.8.6.ebuild 2671 BLAKE2B 7d1b0e7df93a63bb795c03a985950e1da7f16f36db76bdb2602d31fd014a3016956cf6bccfe98ef48eefc321ab62ed24b6bf26f2d6cac92198486f4819ed486e SHA512 1d0837c24c04c25b64bc4b9da0a528b65ad8a04adce135507d11b26dc8183e9be0e66243de3338298a613527e8e6e581e648f2f0783788d943e160e170db1404
-EBUILD ddcutil-0.9.1.ebuild 2676 BLAKE2B 59a29bfa251d9417453cf0eef4906cd02e9aaa16d7c86023f817c993e77c4f0cad7edafb8ad8f1c1de611105bf8ab8c8084c0ee94796fb8fe92296111f6d313e SHA512 2b8c4bcc1f3af3899df66181c23099374af5b25650b27707e1437db1c8ed69c887e857313a0a7aec8b1190a00f213d366ef1467fffcd8f9e7f6e100de0332679
+EBUILD ddcutil-0.9.1.ebuild 2680 BLAKE2B 1d5a6ec7d867528aa82ea1c401a7b9f5e4e70da6f2f616ae9781851e0a1f320b266ca3b436631103c0e0f104dce55f55cafe131f910cb921e25522484b0946c0 SHA512 6da340c08a14dee704b9a6af2d889f55155414f16afaf3ba63669beaa090865f4049d2a938fcd6d76c45f947fe5a72cc01e1ff7df8aac70b6bd62dc52b3a4b5b
 MISC metadata.xml 1293 BLAKE2B 185066701c363efd3520b07a9ea0cd70f94f0adfc10ea4d3cc624904c6bd66ea925bac4ccb53afa22bb7bb24b843e019fcf62e11a26c934ef16729a50f2a7117 SHA512 cb5e342c412ab146f28e75944a47d91b73b7148234c2f25966fe24993c595bff47c5e5b87bec82e07401b41338837d5425ca32f02cfee4df20d176954abb66d3
diff --git a/app-misc/ddcutil/ddcutil-0.9.1.ebuild b/app-misc/ddcutil/ddcutil-0.9.1.ebuild
index 4a1c2ddb93cf..a0f3bc6bf4da 100644
--- a/app-misc/ddcutil/ddcutil-0.9.1.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
 REQUIRED_USE="drm? ( X )"
 
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index ffaec76808ec..ad898f9faeb2 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,5 +1,3 @@
-DIST digitemp-3.5.0.tar.gz 267947 BLAKE2B bdd5cd84160d4826205ac74676897b9caa296c203fcde738c99f89baaeb7637f3995afeb7741e1d1d3e6cb64776de2479fe7d54d1b499a400cbf7b59f8d46349 SHA512 59055a97ae35cdc86bb893a755975b688d3be9185e717f5da0024d664e6c93dd5a7f10f1230772c3bc1bc76a088392da083ba63d28e054727b9f68ce31de64d3
 DIST digitemp-3.7.1.tar.gz 144870 BLAKE2B 5d00197ba0122772d96c3185f430119961d214f50dc07dcd5881e1aa1135283680ff38b4d92736827f5c7644b11930b9418b8467f276e832e40f4228d08d1774 SHA512 e5eaf576b544c61049a358dece7dc96d9793b751ef08645060f3b2c1a2006e2906c3aa3f97de3dab46818290d664d2e784a948b2495b538a200b6d71b03173d2
-EBUILD digitemp-3.5.0-r2.ebuild 1826 BLAKE2B a9cfe9ca027e64237c2e46a8e1f216e0824eccec720c84e9e17fcae440c058ef4cc49e366259e075de879c0fe9014dbffc1a088b1a91a2674efe84872e06a5ee SHA512 2dc36c29e0c64c9f87372493d0aefb26105af1cee219c51ed6c4d224a378cec9a793fdcbfccbfa3bc1f94733ce286f8562fede0bfa1626faee3995aefa0f63f6
 EBUILD digitemp-3.7.1.ebuild 1840 BLAKE2B ff43d430f02c99fefb016759d955dbfb1c86de399cdf791bf121790b62b333b3ab044d06c42c53404b7f3e8b5b0119d4226fe35fd4380912f5160d08364776f7 SHA512 8ff41f59044c5b118524e9b7304d756ab1ec58e802ec936b664d0fa618e4f602630a734fc46573d98116293f099c3f929d805311e9961f4d18c54fb83036512f
 MISC metadata.xml 982 BLAKE2B 9a74eb54a17f249dd527e5aa4b292dadce934da1d1303ba6ca3bb5503c5e235836261495af1eb3c04e0322725c46838b1c902e8f5862856edb3696a147a74184 SHA512 8dda9bc7dff244e54e4951d553f2255bd1da1279221374fc514b5483e36ae129fc9e154c8bf07bf66b3ddc9b2bdac172184b3d9b89c06852f0f9f2237de627a2
diff --git a/app-misc/digitemp/digitemp-3.5.0-r2.ebuild b/app-misc/digitemp/digitemp-3.5.0-r2.ebuild
deleted file mode 100644
index cd0f7c008a75..000000000000
--- a/app-misc/digitemp/digitemp-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"
-HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/"
-SRC_URI="https://www.digitemp.com/software/linux/${P}.tar.gz"
-
-IUSE="ds9097 ds9097u ds2490"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-DEPEND="ds2490? ( virtual/libusb:0 )"
-
-targets() {
-	# default is to compile to the ds9097u.
-	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
-		echo ds9097u
-	fi
-	for target in ds9097 ds9097u ds2490; do
-		if use ${target}; then
-			echo ${target}
-		fi
-	done
-}
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" \
-		-e "/^LIBS/s:=:= ${LDFLAGS}:" Makefile
-	# default is to compile to the ds9097u.
-	if ! ( use ds9097 || use ds9097u || use ds2490 ); then
-		ewarn "If you don't choose a component to install, we default to ds9097u"
-	fi
-}
-
-src_compile() {
-	local targets=$(targets)
-
-	for target in $targets; do
-		emake clean
-		emake CC="$(tc-getCC)" 	LOCK="no" ${target} || die "emake ${target} failed"
-	done
-}
-
-src_install() {
-	for target in $(echo $(targets) | tr '[:lower:]' '[:upper:]'); do
-		dobin digitemp_${target} && \
-		dosym digitemp_${target} /usr/bin/digitemp
-	done
-
-	if [[ $(targets|wc -l) -ge 1 ]]; then
-		echo
-		ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}"
-		ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*"
-		echo
-	fi
-
-	dodoc README FAQ TODO
-
-	for example in perl python rrdb; do
-		insinto "/usr/share/doc/${PF}/${example}_examples"
-		doins -r ${example}/*
-	done
-}
-
-pkg_postinst() {
-	echo
-	elog "Examples of using digitemp with python, perl, and rrdtool are"
-	elog "located in /usr/share/doc/${PF}/"
-	echo
-}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 48abec91ef57..d24b33707f97 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -6,6 +6,6 @@ DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc8
 EBUILD mc-4.8.20-r1.ebuild 2489 BLAKE2B 36736aba7e7cf3a54445d09aa3ca89940eea27f75662e338a177de584007467466f57878aeedeeab17c3de3ed99d508b571c6e17cf3668ad4c40324832479e98 SHA512 357c2fee6e10147f5b85b9dd645010f7a04365fd5f3d3b0d18fe6a25a48ec4534f492f924a869402a05072c26817bdda80b61f3c0af20f6aaa06d21376dceb0d
 EBUILD mc-4.8.20-r2.ebuild 2626 BLAKE2B 7c91fffbe41d84790039342966abc75ba05c40ddde03148493be89bdd5e1c8bef88640d8f800d10c571bdc74ee09153138d6fc06e2ec9f58657eeda21084f580 SHA512 fb5e82276dc7a1fe0e36d0f8cc2209aefebbb677e247685c918fb0ffbd36c132ef154a5e20b3dde2de4fde0adcf4afe85bc152fdb6289e186cd5dde2ca721bbb
 EBUILD mc-4.8.21.ebuild 2432 BLAKE2B a7c051633f812a0817f1fe590feece7f8926798a0e8aff4580d695fb1ecee428a82d66e269cfb3e1c3a041e1643079abd1ba30291a4f1c87e4d0e185fa31ff4f SHA512 fd97e7bf3293fb22d3dfa17cac05d2ee229fcf05c8bf496ea03e08b626abedc1e2b33b41711b38ae1c5083480682540c99064c49fc7969acbb9de3b4fd2442f5
-EBUILD mc-4.8.22.ebuild 2638 BLAKE2B 6542b9377431ae066c4c7a74b7af17caaa6e8f61d9a4bac4f4fe5193cea229c900486e78c8007e4b3afafeba8156ac36dcdbdcbe32dc8b979cbae3e0d42c2fcb SHA512 5eeb78c0775342e68d6c3da8f9f51228489ca2fba087146ac20f9bf0b773eab2c478ecad9575b7dbfc8fab998ef99cd6052603e23b0f7e4bb1e158371e9a2c46
+EBUILD mc-4.8.22.ebuild 2637 BLAKE2B 60303008a3c8ca884082d4cbd2c7d9db88faa6ad88cc8e6369ba8152d4dca3c46b234b0f16f4519ad1fe2c1b5cba644715ff6fa604ca5f8ff8707dbfb68e7579 SHA512 d134607cb038fcf80e7cbbacdef7bf81364a2a9deab35ba6323d10d9d487571e418f165d214108ecb648e048a519c0f4c6e6ac58caab4b3192d78a337bde5cfb
 EBUILD mc-9999.ebuild 2893 BLAKE2B 64978ade6c20ddf9babc40628bfd6ab1232e82ae2e2f508825d06c49f13a45d90dee7836849cd59fdc22b09bdb6d07f503af1bae46bdec1151b658a56fced071 SHA512 f8f59a611a500853882dd2baa0249d65a99c8ccdd042b756f9543219090485a152533acc412a08d25c4dc0ecde04b249664427a1ae5a0334eae9a8627dd1b29b
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index 7fdb6ba9ca13..6e9bb632c7a3 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index d811aa5b9faf..aee05f7cf567 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -2,8 +2,10 @@ DIST nnn-1.9.tar.gz 43405 BLAKE2B c085f13883eb379cc04b225d3a6bdbc95dcfb200a0c338
 DIST nnn-2.0.tar.gz 45791 BLAKE2B dd6eb88302d39b1d5f321b3fa3a19f97c70477178f7c5678433be47fb8091ba6fa5b78f99dc2e15fb8d2c46fc012bab86b3b3ae1dd162357589e0926ed126d55 SHA512 73d6c0747461648e01b8145451a14a531002e0d005c59a3bef9d6d1a6cfc4ba7210a15879e92037af2c0e1d4c728b9c30894d7b029dedb2925634b4925ce2d72
 DIST nnn-2.1.tar.gz 48481 BLAKE2B cbf5dbcb2548e21996f3fa5b5399a56644d1e7aed6023c4ca4c2b960b2bab8833b9f8f1bfafb6d2cc2257730ebe1b3a80e0a253d81f154580888517fbfc50341 SHA512 4ce20944df613706545cffb70896b9c494ed0304a591b1ffdae4886ac3783c2c1ab321b336b9873bd8b1382bc9c6ae8e0226f7abb98fb461ed64b28e1302d8f2
 DIST nnn-2.2.tar.gz 50955 BLAKE2B 010b68c20e7ce4ccc8df65192d7be0a76cb5a84973093dc97bd853a7f525904157d59f5db96ab0dd690c7fd340a90e8aab222003d51ceb8de8febebe62ba1c49 SHA512 0144c9f9c29c2ff3818cf14532354e8182f872580ce7c5a06ab8595b4354edc3a4ede3afc667cd0561a3de4d2f34965a9c057f7ac9555d86feff83abaaca5793
+DIST nnn-2.3.tar.gz 56286 BLAKE2B cc1d79ccf467ba47fc4b50f335e7f2a9b1962555afacc4996c986c9b962950c1f645ce9b0f0e7555a842f429dfc80a24522613d5f447c5edff13111baa57df02 SHA512 416eb08a40534ff4b92b8757c75d8e599d2ea1cbfe7cdedaccac42fd819b1f15e3da839181b232036b1d63dd8bf7c82df801cb4c456e8917fbe47a9a25fae361
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.2.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
+EBUILD nnn-2.3.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.3.ebuild b/app-misc/nnn/nnn-2.3.ebuild
new file mode 100644
index 000000000000..8caa1e33b705
--- /dev/null
+++ b/app-misc/nnn/nnn-2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins scripts/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 29cefff6c02d..eef3d66d0c66 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,7 +1,5 @@
-DIST pdfpc-4.1.1.tar.gz 96995 BLAKE2B f032cf0207cfb116ef98a171376d1cc80ae20f70eb7a63cf29dbd93e73c7bc1b0ef7638f9086d9908470d988830c4b420d9b96e7764af6219267d9ca6aad557a SHA512 51fa8e7743e02ba7e119dc86505f4513c174842a22d5755154775bd9abd945e7bcb9ba3c205cb27de25c38271762307136cb5370443131ea80cc0b9187e531bf
-DIST pdfpc-4.2.1.tar.gz 104515 BLAKE2B 96939731e4881e9dfadb5c00e449adaf8d3b88ca8d726621e9e1ffb1a5afab3e44f2c39a587704427cab53b1e06e7cfc6873e0b9e4ed284a6203f0c5280f8065 SHA512 27674c600c2212035996a8d362432655eb6d5ee12ec34af6f6417fe05a9f5ef051f9f528bac681ab7fafc32deb38b9788256122d43ef47d0fe75d5b8e2863679
 DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
-EBUILD pdfpc-4.1.1.ebuild 1047 BLAKE2B 71e94a6c2e63ffaea3046a1426036ff859b2243f7b539a9239585de10a15d60810a1c7537e2f382ee763da14a0b58632a5f70d2bafb46fca772b838e0410891e SHA512 72167e26b6c82d643fb791bc19033d41df196d8f8ce3d5bb03ab5488785c0e3aec8f16c6d5d9e85fa23289bdd60d37e0fa59bf0060ee3c692c8b275c7b8b0002
-EBUILD pdfpc-4.2.1.ebuild 1046 BLAKE2B fece2040846a3c1dcf45a3b20c6e0eb139160e3bdffbb4ef2aa1afcd20f80dfa2e15b6e10aece16eb1170a33adf1a11a1660eaf4b7afee647b090f0f609ccca9 SHA512 4d6bf8fce6f4b8a7446e093832537a9267a9d1078dc30eb20d3c6d6362a9cd539e24004b9036ae3ed9c464cd6ff2a6f059434a4012874b01c3cb8b8c99e8e1dd
-EBUILD pdfpc-4.3.0.ebuild 1013 BLAKE2B c9bb4ffa6d50aa2e94d6655b34e298aa9a2be46d40ca7b9dd00b74ec10f21f4bac2e5133b3f30b6ca9a7f2e6aa72b9966449cbc84d5e19a416e2983c3d9e98de SHA512 71e63f9145b513474b0dee5cbcf5e26b70edd376dca642330d092aee92699e4a6de167c3b23c6876275dc70d3d6b467a0be249727a79e820ae15b42549b9c977
+DIST pdfpc-4.3.2.tar.gz 107504 BLAKE2B 5fe9ee096aab205365f93374b8ffe3990cf1aec818bcb36d2f35d572854348087f07f7e99df1c71dfc1b40c1c3c1e9e4e666a698020398416b59d151c74805d4 SHA512 e1e198c4cad996e7818dac10c07133e5c6cccf0333506eecb1090091b5c1de36f27e08178c648587e68816cc7e7d7f1666181c09a01780ea6d620c4c9820674d
+EBUILD pdfpc-4.3.0.ebuild 1012 BLAKE2B b52a06bbb655589e227e28536aa6a9826b5b9219f30fc8c52a7bd341d1cd3146835d16d8bf786a7c93cc78b9af5e2411ea51b8b65bcc3bee58946b1d599f2831 SHA512 521ef4a686c93c801be6a2112d299da49e5fb0a9498803a1665c7bd78bd9e3b5994511a016c4ddb526f327e220daa287a8d78d52869c19300e9efd1f1dd5c3f7
+EBUILD pdfpc-4.3.2.ebuild 1039 BLAKE2B acbd74585c88a8fcb51a234e116cf3ba341d711d081e660cd98e97a6051c3a13bd1fe095b7f691080be6cd7e973e9c058c8fecce27315d378aa255bc0dcb79fd SHA512 d286fd505fda426401336836bf3e6eaab6e099ef267af9da413ed5a2105807284f53e9f48c89285aae85e29a9a613c29e5c778be03937431c4e7e2fb25df82d4
 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/pdfpc-4.1.1.ebuild b/app-misc/pdfpc/pdfpc-4.1.1.ebuild
deleted file mode 100644
index 23b43ab32420..000000000000
--- a/app-misc/pdfpc/pdfpc-4.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
-
-inherit vala cmake-utils
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="http://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer"
-
-RDEPEND="app-text/poppler[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8
-	gnome-base/librsvg
-	gstreamer? ( media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0 )
-	sys-apps/dbus
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}/etc"
-		-DMOVIES=$(usex gstreamer on off)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/pdfpc/pdfpc-4.3.0.ebuild b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
index c21761db0594..c7c93c172f18 100644
--- a/app-misc/pdfpc/pdfpc-4.3.0.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer"
 
 RDEPEND="app-text/poppler[cairo]
diff --git a/app-misc/pdfpc/pdfpc-4.2.1.ebuild b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
index 9b616b11b484..acb64556e3fd 100644
--- a/app-misc/pdfpc/pdfpc-4.2.1.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.42" # fix sed line if you increase this
 
 inherit vala cmake-utils
 
@@ -12,26 +12,26 @@ DESCRIPTION="Presenter console with multi-monitor support for PDF files"
 HOMEPAGE="http://pdfpc.github.io"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
+IUSE="+gstreamer"
 
-RDEPEND="app-text/poppler[cairo]
+RDEPEND="app-text/poppler:=[cairo]
 	dev-libs/glib:2
 	dev-libs/libgee:0.8
 	gnome-base/librsvg
 	gstreamer? ( media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0 )
+		media-libs/gst-plugins-base:1.0 )
 	sys-apps/dbus
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
 
 src_prepare() {
 	cmake-utils_src_prepare
 
-	sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
+	sed -i -e "s/valac/valac valac-0.42 valac-0.40 valac-0.36 valac-0.34/" cmake/vala/FindVala.cmake || die
 	vala_src_prepare
 }
 
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index 99d0b0cdb580..d27e275545b4 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -19,6 +19,7 @@ DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde112b9c8b4dde08780d7d50cb8bb4ec2ef555df941be4e89f1f3aa49b335e640702bf8b10e609d6cfba211 SHA512 018962a728b9729b51afdc8975cddeceec84731f43b776a740ad2b4d2a479ceadd7a4d45c6eb5389ef73cdf18955a74ac85e9bbb4ad823e4d4a5d9972a4aa19d
 DIST skim-0.5.4.tar.gz 87040 BLAKE2B c7816dae5142d3230bf98db7c86ec8b8d78adac52dfe19c6760d65b6ea81e704f84c4127c9ca1d74812ddef69595290a8f09f01869a41dc17a42a33d2eedb15b SHA512 f21af6c86ca6b1c4aab1b715c1c47ced1d06c45216a03493cfc3f01d7ed6ecb6e287a335d0756f4b82b97d4d22493b01598569a0529bc57983a5a4716427af83
+DIST skim-0.5.5.tar.gz 87411 BLAKE2B 98dbd5d8f5d45a0752975316aa41971622e6d65e91dbfe9c8248882931d05dcfb0d8ab32fc51504060fd41aef7c456c8f753e2939a726ad41cd3b82515adeeb1 SHA512 a6970252633e32004edc4e4cf910a5d07d1a63b11b77e56d5ddc6ad656d33ea984dc02523fbfaf5eeb58c197d95a17fb6bcdf16448d68c6a239798b3180d7aa2
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
@@ -33,4 +34,5 @@ DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 EBUILD skim-0.5.2.ebuild 1353 BLAKE2B b9ce81124e4cceb55af348e45105bb5cc55ff1e21270534dc2e4fe2ce339717129e9e9d82380a3503aedfcb19106959cd0684ba41f0b06788baf8e7778077c67 SHA512 ee1d0d208c8b887487ad9e09a9ad3f144bb9838108036901495623682d4f5493082f5c4355798b83e14112903132b245df95eb46a9e4909552fbf40d0b0fb734
 EBUILD skim-0.5.4.ebuild 1389 BLAKE2B b7a979df15c653f37dbd805e6d34095ce47f8869e355699c476febe75d51dfa61212a4153c6ba2de8ea2b8dfb6528272259a2b884aac1f95bb0e85c0ddcd2067 SHA512 eacdaa3d57aa3c362ff48541ad81c4d234549e03255be1b217e88c81c343f2af9259747d001031bc44a3c734f29b356ec830757984094f06e3216bf8b62ccbae
+EBUILD skim-0.5.5.ebuild 1367 BLAKE2B 200e4fdb046dbb5f16316e9c7dd390393fedc184e76d5a061b0ad1b65ad18171f76a49f334bd3ceefef41c4d3a95931bc375973c8fab804031508b8e54d0e444 SHA512 4df3904246b2f25ffed97eace185604786c412c0420433ce51352ac071148dd9f08e619e654e49436949662c25973534ae18ec01972e936a2d78ba989b9b456f
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.5.5.ebuild b/app-misc/skim/skim-0.5.5.ebuild
new file mode 100644
index 000000000000..37e18dab525f
--- /dev/null
+++ b/app-misc/skim/skim-0.5.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.10.2
+atty-0.2.3
+bitflags-1.0.1
+cc-1.0.17
+cfg-if-0.1.3
+clap-2.28.0
+env_logger-0.4.3
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+libc-0.2.42
+log-0.3.8
+memchr-2.0.1
+nix-0.11.0
+redox_syscall-0.1.32
+redox_termios-0.1.1
+regex-0.2.3
+regex-syntax-0.4.1
+shlex-0.1.1
+strsim-0.6.0
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.4
+time-0.1.38
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+vec_map-0.8.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="a command-line fuzzy finder"
+HOMEPAGE="https://github.com/lotabout/skim"
+SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tmux vim"
+
+RDEPEND="
+	tmux? ( app-misc/tmux )
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sk"
+
+src_install() {
+	cargo_src_install --path=.
+	dodoc CHANGELOG.md README.md
+
+	use tmux && dobin bin/sk-tmux
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins plugin/skim.vim
+	fi
+
+	# install bash/zsh completion and keybindings
+	# since provided completions override a lot of commands, install to /usr/share
+	insinto /usr/share/${PN}
+	doins shell/{*.bash,*.zsh}
+}
diff --git a/app-misc/tdl/Manifest b/app-misc/tdl/Manifest
index 5d18c067b65d..33049cc25433 100644
--- a/app-misc/tdl/Manifest
+++ b/app-misc/tdl/Manifest
@@ -5,4 +5,5 @@ AUX tdl-1.5.2-man.patch 11004 BLAKE2B 849601edce8452c3ca590b6b10f211ee81355adc12
 DIST tdl-1.5.2.tar.gz 66057 BLAKE2B cc2d5581126d995098b5dc3032c97213614acaea3b984a507a824da2ba4d3be9afff954722f29acf0b9bd26db42ada22d67fc9110496961c2cb3104d9b4b7ece SHA512 8c07a5b6a5434bb567a2d68b6e0215bbfa7be3f7176ae1042652ac18684289117230af25d8d161fcf1ba27d9b740fd3fcd43c3213467b533de64390686481fe0
 DIST tdl-screenshot.png.tar 20480 BLAKE2B ce9284501ba1550179e1c3da54399a802aae3c0fb23b9a1ea25a1adb0f5c0404fe7694a360435913bb91cc1977d71561050ec0fe4e1681db775cdc7ec5fa11b7 SHA512 caca9793626b320ded4c7f16425b98e4bfde9ab0ca3c1bea60ecc8aaa8db080ab6fc3c474aef4d56e394b6415ec1162671329912aa22452dbd5dc72b50c7c8f6
 EBUILD tdl-1.5.2-r2.ebuild 1513 BLAKE2B bc883123e1df051229cfe479f95f46faeb498dbb4aa8c501dfd901a247a0797dd80c528603ed518202e3eb8fab926f0ba825af69f77c6123eb77fcee8318242a SHA512 40c6116b132441e21d62bccb997b1e140879df1981684aaba097d8b3373b4f933d94b89e52b3dc2d864a1b08193b09811437bad3077e228a600d0275fb752794
+EBUILD tdl-1.5.2-r3.ebuild 1545 BLAKE2B 3196423afbd839889bc0b8d7edcf65a74ead9693a13a93fde89ce5fd07ae8a2556682399fd383dea3b09a8829240a4dcc1868a61f1244e7e3c1b29abdaa718a4 SHA512 b3f9998f6bfa8ed6368612f8d012f5f4b25704315b4633830e519fa6de71172f4cedb4d21672a0908cc04e7085e270d7e639960cf824a35fe486ce65aaa2f89d
 MISC metadata.xml 507 BLAKE2B 9887ee368ca6f3409ee7da8a1fe98b0b6bac98f3b6949a1a263c9a8966b95d73c33c2b496f98732824e08d17af45b12a12916707e6932be88a947e9ca46d416e SHA512 ce0e36e0dc95b3c050f17e33220bb85c07946127337ae766b7c3af2d9d0891187bb9ab73d8cb01f91bad4f061620d19a403f3af85c801e3194f0a9dc6a0b6ce2
diff --git a/app-misc/tdl/tdl-1.5.2-r3.ebuild b/app-misc/tdl/tdl-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..5585cf30099c
--- /dev/null
+++ b/app-misc/tdl/tdl-1.5.2-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Command line To Do List manager"
+HOMEPAGE="http://www.rc0.org.uk/tdl/"
+SRC_URI="
+	http://www.rpcurnow.force9.co.uk/tdl/${P}.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${PN}-screenshot.png.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc readline"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+
+DEPEND="
+	${RDEPEND}
+	sys-apps/sed
+	sys-apps/texinfo
+	doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${P}-list.c.patch
+	"${FILESDIR}"/${P}-main.c.patch
+	"${FILESDIR}"/${P}-man.patch
+)
+
+DOCS=( README NEWS tdl.txt "${WORKDIR}"/screenshot.png tdl.html )
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_configure() {
+	local myconf=( --prefix=${EPREFIX}/usr )
+
+	if ! use readline; then
+		myconf+=( "${myconf} --without-readline" )
+		sed -i 's#\($(LIB_READLINE)\)#\1 -lncurses##g' "${S}"/Makefile.in || die
+	fi
+
+	sed -i 's#-ltermcap#-lncurses#g' "${S}"/configure || die
+	"${S}"/configure "${myconf[@]}" || die "configure failed"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake all tdl.info tdl.html tdl.txt
+
+	if use doc; then
+		emake tdl.dvi tdl.ps tdl.pdf
+	fi
+}
+
+src_install() {
+	einstalldocs
+	doinfo tdl.info
+
+	dobin tdl
+	doman tdl.1
+
+	local i
+	for i in tdl{a,l,d,g}
+	do
+		dosym tdl /usr/bin/${i}
+		dosym tdl.1 /usr/share/man/man1/${i}.1
+	done
+
+	if use doc; then
+		dodoc tdl.dvi tdl.ps tdl.pdf
+	fi
+}
diff --git a/app-misc/tpconfig/Manifest b/app-misc/tpconfig/Manifest
index e0d86bf633cb..09133db5feb2 100644
--- a/app-misc/tpconfig/Manifest
+++ b/app-misc/tpconfig/Manifest
@@ -1,6 +1,5 @@
 AUX tpconfig 426 BLAKE2B 8ef3bef0ca0e50d6f220c4ab7cefc9002bdfffb6c018173d181c3e1dab6cc0fca07c3e8fca4c251efc308f24324e382c7477267a18ca792c993a1247e8bf75be SHA512 09c0a954b765404eeee569040b832883f85b2451c41ca4465ef5febf80745fb9a65fdabadff9967f014d064134c353c66953c26e7295b4ced3dbc172975d536e
 AUX tpconfig.conf 132 BLAKE2B 9d5f6490eee22c619d458a5190889867c1995f294aec1ed60bc6edcb2c83b3c47d94c473ec52d367eadf441e73258bcb5e2a0ceb0e578b6c0df6069231514649 SHA512 314f05fb3211790e9c5de47f99d14bcf96788f8baf1d5258eb17d71dea05f0bde7b249a99321f472e4339c066705d9f18b529f97b1c03a72da4f21c14b91f77a
 DIST tpconfig-3.1.3.tar.gz 106789 BLAKE2B 1a02a1c91ce2174ae406888a73ad488d79e60941d0e904f47c9ff1cc82319780cf9874ede6ec4b18cc9176bcaeb465c201fca1bdf5840029565e5a3c5cac85f7 SHA512 b10b709f113dcd526c7521f519466677a1dd37b5c3bd4adf7a0fdbf95428bf56777a726b85e158c4842d406e7659f1b6e161c68bc6f6c6739d376ab84351efc9
-EBUILD tpconfig-3.1.3-r1.ebuild 624 BLAKE2B 0b92b934ad41e74ec13dc4b44a1301cd1a1aca10d52ab977db49ad83bbd385dcaeaea58e686813c00a69e8d99750c22344b82df2216debe43f488cc03b2723fd SHA512 2ba37d238c27320b483a041044b552271c077376238bf61c6460fde01e887b23c21ebafc7f5a342ee383b478f526b14d008eaeecf1f58cbb5546024e29f7530c
-EBUILD tpconfig-3.1.3-r2.ebuild 571 BLAKE2B cd7065bdac05e3ea3ab75582f7815b7f2844a8e170dee34aa26b84572f536a68368b99e236bb76f1b8b66593f08bfb22636731115bfdb3edd5324e7d3624249f SHA512 00477cd9e913f37dd58a9a91e2ffd8ed8e195ee1b4afc59389ff6cf334eacb5c71f7a391d5769c7be699741e52e2c49838b042e6fa232d34b78bb62b2df8ef2b
+EBUILD tpconfig-3.1.3-r2.ebuild 534 BLAKE2B cb4b2411fadb25132ac0e55ddda395a152642b4c570c72eae6e31b9de20b26d3f0981a3474741d6c793c7db56dbc51765c6d738aa987ecbea7d900a351e67ce1 SHA512 8822a2319a4445a1f9e17468d418cca8fb41196fc1490fc863a0a633f4155f76ac9aaff8a71271e926a066df5522e04170af8d2cb881c069b0642a3c2ef8e3aa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
deleted file mode 100644
index 4fe0e3cb8031..000000000000
--- a/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
-HOMEPAGE="http://www.compass.com/synaptics/"
-SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_compile() {
-	econf
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin tpconfig || die "dobin failed!"
-	dodoc README AUTHORS NEWS INSTALL
-	doinitd "${FILESDIR}"/tpconfig
-	newconfd "${FILESDIR}"/tpconfig.conf tpconfig
-}
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
index 334811db95d8..94932d5acd86 100644
--- a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
@@ -11,16 +10,14 @@ SRC_URI="http://www.compass.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README AUTHORS NEWS INSTALL )
+KEYWORDS="amd64 x86"
 
 src_compile() {
-	econf
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
+	einstalldocs
 	dobin "${PN}"
 	doinitd "${FILESDIR}"/"${PN}"
 	newconfd "${FILESDIR}"/"${PN}.conf" "${PN}"
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index f84b3e11dab8..5273b313193a 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,9 +1,4 @@
-AUX 2.1.5-libav-build-fix.patch 1054 BLAKE2B 30f0364d7f2f6469f6a2867fbbfb428f2b847b2bdebb766e7fa51faad03b10ee542b17602b69463233973b316d27c0943acc9e3104126cf86df54e07bc6bbdef SHA512 7534b850f30f72c6ef294977c8946f0e57bc6635069de45b66f38ca50aac9d2e745da0f51efc916e60bf70110aae5c39d3d73bea47537d6e0d4326ef219b1c02
-AUX 2.1.5-meson-fixes.patch 16177 BLAKE2B 59c7ddaadb703612eadc500ba2cd60333d65f127e36a9dee4b60c65710b53e0cfdfa5b2829c8b334170e76e5eb37c1cc69c014150b928d7f897522f1141e1514 SHA512 d3bcb47e5e7449f9990d6aee261b72d943f61d610661652f18bda61270532591342a00c11b2de04b74744398b83a95c990271f1c7a7f07bfb5cf9db8f4c4b59a
-AUX 2.1.5-rss-symlink-fix1.patch 1815 BLAKE2B 310b5a666fc2c074e07515676f826ba594ef5d672f1493a54ee81f27087f7b9d9107bc7f4f9bba34192d9d7a51482cb2eabc8f5129bc4f9f1f3e5eb8571e3a8d SHA512 7d09dc8e45fe897af3f8a2b91a69aab790f593b3ab16a66a4d3df3a6d694c7e4d709439e4ea8ddcf8dd4f9629634e64a0bba48013a48c628db6674f1d55d01f0
-AUX 2.1.5-rss-symlink-fix2.patch 1699 BLAKE2B 654e60d78af3036e47b8d1e152f24206a36250e2f80e37cd0a04ff1d34d9227a644e48cdbadedd8d620abe514ac1565462075e2d00020f14ab22d7d6d023bf1c SHA512 ced53feae62278acf4e5b35b48ede3b7982c4b2c2b973ca17a40272f93db23824122f2c262ad482901ddbc85bf91839e70a17e90684d36ad21e5af49e28eb68a
-AUX 2.1.5-seccomp.patch 1132 BLAKE2B e5f66ae4ab30b80fac96a54b58974a13a89f007e939c004680a163c98bc082dc710133443a7905bebaf71ace6f4138fbaf92586547c73da8da3d87f01d989b48 SHA512 7a5629dfd1854252c12066299bf5e3247524133dc54478fdadeeeb1b5945d2a3486a78f93223a56349be2539148a45046ffa5e6ec770ac3d203977de5a5392e6
-AUX 2.1.5-test-fix.patch 1710 BLAKE2B 4e22251796d78fbfd7b1503bcebb58d4c9361c9c98613575ac9cf560724a83a3d5e5168427b131c2916e5a9727668b83295fffe1a03b7eb503aaf4fcc136bfc9 SHA512 8ff2471fd2781cfa87b4fa08a0e5237e8610235795f773799019dbff59785bb010f167bebdce5545de67acc2c4a69674aa41968854e739bc260916d602754cbf
-DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605
-EBUILD tracker-miners-2.1.5.ebuild 4502 BLAKE2B ae176fccf4766badd611ac332798300fb9e530a9009541ce55893a20f931923f8fea7fa8c9526af1a038a1f5934e84beed6764882c3a06e1ee9e1b624f075609 SHA512 b7a9a87470333e6b6c69f8e9ee6f4b734203cfce5c22ca0fa94e0b5eeff1a4038b9579d997f28e741adc7e16f9acb38021674a01efa48562894237cb62a05396
+AUX 2.1.6-cue-meson-fixes.patch 2632 BLAKE2B d3d63e27b8d1ff4f3463826399133c2396dbb17fb38e9aae43df8da43aea1c05ccb6c0567235773ecaa8a5741dc75ec1be49ec06d604f6751d79e32fbb3d153a SHA512 3cfda20f1be0c956de2de2b2cc70960373c2d74ddbb895480026faa32e053bcec4db42473d15d8b37d567d2fdd2b8ccb34e8bbdcc9446fb03089eefe2fe8bd4f
+DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
+EBUILD tracker-miners-2.1.6.ebuild 4482 BLAKE2B a5d534d8b1feda1dc7cb311cbf1b6dc2483b12121afa0e8317938874c7fbf7139f0f4158d659cac7d440dcf2059e574c81d4cd4377cde74398f72b075b13bb0f SHA512 6b9cc1269db9912eb93daa4a1a2d4f24004383243de683e3e809d2d73cd1243e82d0c9f43ab3dd345a483ec69f0af0d1d04327cd6c4ad5a4b6d6074d28f3b42c
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
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 580ecb34ba22..000000000000
--- 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 c8a3e6358df8..000000000000
--- 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 9cccb2e36e9c..000000000000
--- 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 30fef51ca492..000000000000
--- 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 f32d698a4873..000000000000
--- 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 be979e6af057..000000000000
--- 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/files/2.1.6-cue-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
new file mode 100644
index 000000000000..07d6ae9b649f
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch
@@ -0,0 +1,67 @@
+From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik <ernestask@gnome.org>
+Date: Sun, 7 Oct 2018 11:40:41 +0300
+Subject: [PATCH 1/2] build: Fix libcue version comparison
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It currently performs a string comparison, as opposed to using
+version_compare(), which leads to results like
+“unknown >= 2.0.0 == True” when the dependency was not found.
+
+Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32
+
+(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 4273638dd..c30ada4ed 100644
+--- a/meson.build
++++ b/meson.build
+@@ -317,7 +317,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.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
+
+
+From ff6a076330ba1b5a383196795b18e2c069ac54c6 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 2/2] 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 c30ada4ed..28072646a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -317,7 +317,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().version_compare('>= 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/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
index b04c2c5f8c6f..5153b47c8e87 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
@@ -62,16 +62,14 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
+	test? ( ${PYTHON_DEPS}
+		gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0
+			media-plugins/gst-plugins-openh264:1.0 ) ) )
 "
 # 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
+	"${FILESDIR}"/${PV}-cue-meson-fixes.patch
 )
 
 pkg_setup() {
@@ -79,6 +77,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
 	xdg_src_prepare
 	gnome2_environment_reset # sets gstreamer safety variables
 }
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 2751eb64e225..cd7706cdb37c 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,11 +1,9 @@
-AUX 2.1.7-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf94881fc9f72eb6ef86a7cb23daff01fb1d970bfff96f016e4347ad350d2637f1a06b425507bf56f92d92eec165 SHA512 f32f432751ac92d92bd8e83f5252af7b347cd08eb0c6c5e8c5582ad343856ac45a293d5f15adae7167cf216e4b0ac24ab1e298711c478638750ae8a697c4363c
-AUX 2.1.7-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
-AUX 2.1.7-glib-2.60-compat.patch 7341 BLAKE2B 64a322db244551b15c037aaca8f868ced632c25600e1e7c83a22eb532535e9d4eb317e0f9aa0df8b52c86077af839dcfba2f4846e91a37e42d325b7681379b98 SHA512 d14c760626541e3ac0cce55bd837a5ca4a0e627d43aea491d1f1cbbca0ab445317519506a2ae2a22416b39ce9708926683ac9dd3be244d9ae2eb53e5b2675f8d
-AUX 2.1.7-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
-AUX 2.1.7-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
-AUX 2.1.7-upgrade-path-fix.patch 1251 BLAKE2B ea343e15348ddfe8a8a36fc9060d14dc5e8ec2a777e473ab39041692d67c4a5c0ebd8793f6896b49e2c353c25167b5dc42e167222f566757fdd9504d2906928b SHA512 965055c9526fa523d11b77c6bb3bddaa1323dd06d5cccb2f638f89402380b746e11e60f828ecfb4b35e20715a97f940980edbb6a6d2416356c4a84da0ac476c4
+AUX 2.1.8-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf94881fc9f72eb6ef86a7cb23daff01fb1d970bfff96f016e4347ad350d2637f1a06b425507bf56f92d92eec165 SHA512 f32f432751ac92d92bd8e83f5252af7b347cd08eb0c6c5e8c5582ad343856ac45a293d5f15adae7167cf216e4b0ac24ab1e298711c478638750ae8a697c4363c
+AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
+AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
+AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-DIST tracker-2.1.7.tar.xz 2572740 BLAKE2B 0db8379502a37d0fc0c4b905a55a8642011c76368a94609b71afa5b6d59fa8a9220c302588a8217ea8626faccedd6b62e8fc96b19d4fb2cbaf1b550fbc55cf0d SHA512 75203af91ec43641caf2a3870100b8c5affb613e442e5a271edafe68ac7c6551256f288e435ce4fc8cb6f9ee0ea54871ebba90e085d0baeba4914815d3be15a0
+DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
 EBUILD tracker-1.12.4-r1.ebuild 7448 BLAKE2B b1552ee19ab27c1a2fb7ec5fa43de63f53f88da98d77772c979a4941bcff54299d991e20f432155652152d1b3315ffc64eaeed9073261c2f428c334f5f576e41 SHA512 b84d10c8f9979fe3e66007c7e20b229d181c9e1961a92aa70500c6461197ac4a976cc7849e4901107bb4aedb3195540ec12e577f9ab368ea4aa10059ddcf3131
-EBUILD tracker-2.1.7-r1.ebuild 2908 BLAKE2B 52804fce82218814125b5903b3f7546d1c443c0463cd6db1be9077e5be8e2bcd5d9dc2ab823709eed3530139f6b7fdcb47d8a4db9b8c7733d29e637fc824d1fb SHA512 f27d33944fecdcfc73fd62090ccd9474bb992a3d91eafc5817eef094344b2a3034252d57755bec9053ad183bd74af3fe6fddd668b26709c48859a99640432752
+EBUILD tracker-2.1.8.ebuild 2820 BLAKE2B 57729529f599964d142f2da8a5f9568a23bc15ace8d93859b1a65e505fb94e97806e5f5fed70316952214ac13bba83a31f31dc2cad0739d52176ea78a397d42b SHA512 9386ce363bde67ccd20ccf15403fc450a4baf7a7374b9b5f3896c356dd23686df6291a9d35e07ffc127da065b2bfc1c8f168ba6dd8fcb50e114cec1bc9ec0f55
 MISC metadata.xml 1545 BLAKE2B 1fee1210e27ad5a33c7e121372a64ed7d70c5c8169ce7b2688ff395cb56a218d53a8c5561701498d52d7772be1ce77d44275c938ad9486dc039e2f301bb14b6d SHA512 b379f0ca9737f7847ec7e0e83148ef354a56433d5fcd45996feaa86d9773c60b97f226ca21aba48aaba31f17ead8ea1922d408193328f477d58449ed3a732f71
diff --git a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch b/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch
deleted file mode 100644
index 93737f79857d..000000000000
--- a/app-misc/tracker/files/2.1.7-glib-2.60-compat.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 43b10233d4cce38230c357d885662291d2e5e978 Mon Sep 17 00:00:00 2001
-From: Iain Lane <iainl@gnome.org>
-Date: Mon, 11 Feb 2019 15:42:14 +0000
-Subject: [PATCH 4/5] libtracker-data: Don't rely on hash table iteration order
- being stable
-
-This is the same problem that was fixed by
-c58f7aa419e2c3a69fa7fe583a1fd5e0b9bd0839 on master. Instead of relying
-on hash table iteration being stable, pass the GVariantBuilder down and
-add directly to it in the right order.
-
-Forwarded: https://gitlab.gnome.org/GNOME/tracker/merge_requests/55
----
- .../tracker-sparql-pattern.vala               |  4 +--
- src/libtracker-data/tracker-sparql-query.vala | 31 ++++++++++++-------
- 2 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-sparql-pattern.vala b/src/libtracker-data/tracker-sparql-pattern.vala
-index e03ed6f16..033b138a5 100644
---- a/src/libtracker-data/tracker-sparql-pattern.vala
-+++ b/src/libtracker-data/tracker-sparql-pattern.vala
-@@ -542,7 +542,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = query.generate_bnodeid (get_last_string ().substring (1));
-+			result = query.generate_bnodeid (get_last_string ().substring (1), null);
- 		} else if (current () == SparqlTokenType.STRING_LITERAL1) {
- 			result = expression.parse_string_literal ();
- 		} else if (current () == SparqlTokenType.STRING_LITERAL2) {
-@@ -569,7 +569,7 @@ class Tracker.Sparql.Pattern : Object {
- 		} else if (current () == SparqlTokenType.OPEN_BRACKET) {
- 			next ();
- 
--			result = query.generate_bnodeid (null);
-+			result = query.generate_bnodeid (null, null);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
-index 7944e78e5..69a7e9eba 100644
---- a/src/libtracker-data/tracker-sparql-query.vala
-+++ b/src/libtracker-data/tracker-sparql-query.vala
-@@ -284,7 +284,7 @@ public class Tracker.Sparql.Query : Object {
- 			sha1, sha1.substring (8), sha1.substring (12), sha1.substring (16), sha1.substring (20));
- 	}
- 
--	internal string generate_bnodeid (string? user_bnodeid) {
-+	internal string generate_bnodeid (string? user_bnodeid, GLib.VariantBuilder? builder) {
- 		// user_bnodeid is NULL for anonymous nodes
- 		if (user_bnodeid == null) {
- 			return ":%d".printf (++bnodeid);
-@@ -310,6 +310,9 @@ public class Tracker.Sparql.Query : Object {
- 				}
- 
- 				blank_nodes.insert (user_bnodeid, uri);
-+
-+				if (builder != null)
-+					builder.add ("{ss}", user_bnodeid, uri);
- 			}
- 
- 			return uri;
-@@ -774,7 +777,7 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				solution.solution_index = i;
- 				set_location (delete_location);
--				parse_construct_triples_block (solution, UpdateType.DELETE);
-+				parse_construct_triples_block (solution, UpdateType.DELETE, null);
- 				data_update.update_buffer_might_flush ();
- 			}
- 
-@@ -790,16 +793,20 @@ public class Tracker.Sparql.Query : Object {
- 			for (int i = 0; i < n_solutions; i++) {
- 				uuid_generate (base_uuid);
- 				blank_nodes = new HashTable<string,string>.full (str_hash, str_equal, g_free, g_free);
-+				if (update_blank_nodes != null)
-+					update_blank_nodes.open (new GLib.VariantType("a{ss}"));
-+
- 				solution.solution_index = i;
- 
- 				set_location (insert_location);
- 				parse_construct_triples_block (solution,
- 							       insert_is_update ?
- 							       UpdateType.UPDATE :
--							       UpdateType.INSERT);
-+							       UpdateType.INSERT,
-+							       update_blank_nodes);
- 
- 				if (blank && update_blank_nodes != null) {
--					update_blank_nodes.add_value (blank_nodes);
-+					update_blank_nodes.close ();
- 				}
- 
- 				data_update.update_buffer_might_flush ();
-@@ -870,7 +877,7 @@ public class Tracker.Sparql.Query : Object {
- 		}
- 	}
- 
--	private void parse_construct_triples_block (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
-+	private void parse_construct_triples_block (Solution var_value_map, UpdateType type, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		expect (SparqlTokenType.OPEN_BRACE);
- 
- 		while (current () != SparqlTokenType.CLOSE_BRACE) {
-@@ -878,7 +885,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 			if (accept (SparqlTokenType.GRAPH)) {
- 				var old_graph = current_graph;
--				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_graph = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for graph");
-@@ -887,7 +894,7 @@ public class Tracker.Sparql.Query : Object {
- 				expect (SparqlTokenType.OPEN_BRACE);
- 
- 				while (current () != SparqlTokenType.CLOSE_BRACE) {
--					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+					current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 					if (is_null) {
- 						throw get_error ("'null' not supported for subject");
-@@ -906,7 +913,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 				optional (SparqlTokenType.DOT);
- 			} else {
--				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null);
-+				current_subject = parse_construct_var_or_term (var_value_map, type, out is_null, builder);
- 
- 				if (is_null) {
- 					throw get_error ("'null' not supported for subject");
-@@ -925,7 +932,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	bool anon_blank_node_open = false;
- 
--	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null) throws Sparql.Error, DateError {
-+	private string? parse_construct_var_or_term (Solution var_value_map, UpdateType type, out bool is_null, GLib.VariantBuilder? builder) throws Sparql.Error, DateError {
- 		string result = "";
- 		is_null = false;
- 		if (current () == SparqlTokenType.VAR) {
-@@ -947,7 +954,7 @@ public class Tracker.Sparql.Query : Object {
- 		} else if (accept (SparqlTokenType.BLANK_NODE)) {
- 			// _:foo
- 			expect (SparqlTokenType.COLON);
--			result = generate_bnodeid (get_last_string ().substring (1));
-+			result = generate_bnodeid (get_last_string ().substring (1), builder);
- 		} else if (current () == SparqlTokenType.MINUS) {
- 			next ();
- 			if (current () == SparqlTokenType.INTEGER ||
-@@ -994,7 +1001,7 @@ public class Tracker.Sparql.Query : Object {
- 			anon_blank_node_open = true;
- 			next ();
- 
--			result = generate_bnodeid (null);
-+			result = generate_bnodeid (null, builder);
- 
- 			string old_subject = current_subject;
- 			bool old_subject_is_var = current_subject_is_var;
-@@ -1061,7 +1068,7 @@ public class Tracker.Sparql.Query : Object {
- 
- 	private void parse_construct_object (Solution var_value_map, UpdateType type) throws Sparql.Error, DateError {
- 		bool is_null = false;
--		string object = parse_construct_var_or_term (var_value_map, type, out is_null);
-+		string object = parse_construct_var_or_term (var_value_map, type, out is_null, null);
- 		var data = manager.get_data ();
- 		if (current_subject == null || current_predicate == null || object == null) {
- 			// the SPARQL specification says that triples containing unbound variables
--- 
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch b/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch
deleted file mode 100644
index a1fa32738d88..000000000000
--- a/app-misc/tracker/files/2.1.7-upgrade-path-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d7e31d6940efdb6716689136774a94cfdfd83189 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 17 Dec 2018 13:34:23 +0100
-Subject: [PATCH] libtracker-data: Update FTS if base tables were altered
-
-That will issue an update of all tables, so the FTS view might be
-affected. This is not caught by ontology change tests, as this
-is a situation that can only happen when migrating from 1.x databases
-ATM.
-
-(cherry picked from commit 70758fc059e91936e88d5264b195ac291e995144)
----
- src/libtracker-data/tracker-data-manager.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
-index f2addd0df..05a96b4dd 100644
---- a/src/libtracker-data/tracker-data-manager.c
-+++ b/src/libtracker-data/tracker-data-manager.c
-@@ -3701,8 +3701,8 @@ tracker_data_ontology_import_into_db (TrackerDataManager  *manager,
- 	}
- 
- #if HAVE_TRACKER_FTS
--	if (in_update) {
--		update_fts = tracker_data_manager_fts_changed (manager);
-+	if (base_tables_altered || in_update) {
-+		update_fts = base_tables_altered | tracker_data_manager_fts_changed (manager);
- 
- 		if (update_fts)
- 			tracker_db_interface_sqlite_fts_delete_table (iface);
--- 
-2.17.0
-
diff --git a/app-misc/tracker/files/2.1.7-doc-options.patch b/app-misc/tracker/files/2.1.8-doc-options.patch
index 9b25349f659f..9b25349f659f 100644
--- a/app-misc/tracker/files/2.1.7-doc-options.patch
+++ b/app-misc/tracker/files/2.1.8-doc-options.patch
diff --git a/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
index 85ddb6baa22b..85ddb6baa22b 100644
--- a/app-misc/tracker/files/2.1.7-fix-library-symlinks.patch
+++ b/app-misc/tracker/files/2.1.8-fix-library-symlinks.patch
diff --git a/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
index 1f25f115d419..1f25f115d419 100644
--- a/app-misc/tracker/files/2.1.7-prevent-stack-smashing.patch
+++ b/app-misc/tracker/files/2.1.8-prevent-stack-smashing.patch
diff --git a/app-misc/tracker/files/2.1.7-test-fix.patch b/app-misc/tracker/files/2.1.8-test-fix.patch
index b3dedaa9e6ec..b3dedaa9e6ec 100644
--- a/app-misc/tracker/files/2.1.7-test-fix.patch
+++ b/app-misc/tracker/files/2.1.8-test-fix.patch
diff --git a/app-misc/tracker/tracker-2.1.7-r1.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
index 3d59f4f66b6c..643340f1f2c1 100644
--- a/app-misc/tracker/tracker-2.1.7-r1.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -48,9 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
 	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
-	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
 	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
-	"${FILESDIR}"/${PV}-upgrade-path-fix.patch
 )
 
 function inotify_enabled() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /app-misc
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)