gentoo resync : 20.02.2019

25 files changed, 551 insertions, 19 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e28ccc4fdd5e..e6021551bd3f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index ab81ea94aff2..4e337c8ec778 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,6 +1,9 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
+DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
+DIST nss-3.42.1.tar.gz 23416408 BLAKE2B 9c008ce599f3cc4de50af3a32f680e16058a42df7a844aa8f151c729a1c783177d8410b0aa2ea9887f5e69a359d84b655b78808fd817b8ccdeae458d9c7b4488 SHA512 468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20180409.3.37.ebuild 5675 BLAKE2B 3a9d6e7d6e98ab84e2300ac21a0420c835f1ef870cdab61772f3c704545a3974d01c88b461d490310a9bf33c88e4c1e40d58ff4618cb308e08057050b665b3dd SHA512 7789acd51276ba30fc1709526d62a939756c1b94896ffea4ea6dfbb0b1862c2ab580847fb2d4168be87fbde0c28f0aad45b689f2e426ee017e02991064dfeab4
+EBUILD ca-certificates-20190110.3.42.1.ebuild 5809 BLAKE2B 5748c717301e916b4f9559542887a1d474766748d53145eded9b984fd7fa9596527f139365fad2b905330d7f54c1bd1b572af8757601ffcfa87e0539cb8c6c32 SHA512 e90b46be5b0ccb10bce56fcc2dcb522b3fd3357776ee5b6218f464d6da85c915c0698bc815ac25c08b7117316a10260b736fe3a3877358c18147e0be90684bef
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
new file mode 100644
index 000000000000..5bb10882fbc3
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit eutils python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+	inherit eapi7-ver
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+RDEPEND="${DEPEND}
+	app-misc/c_rehash
+	sys-apps/debianutils"
+
+if ! ${PRECOMPILED}; then
+	DEPEND+=" ${PYTHON_DEPS}"
+fi
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	${PRECOMPILED} || default
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CAcert_Inc..crt \
+				"${c}"/cacert.org/cacert.org_root.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/digitemp/Manifest b/app-misc/digitemp/Manifest
index d05391131148..ffaec76808ec 100644
--- a/app-misc/digitemp/Manifest
+++ b/app-misc/digitemp/Manifest
@@ -1,5 +1,5 @@
 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 1841 BLAKE2B 4cbd7434d157518b81ff9f62a371fd668b2f34fa03f31a664470ce914e4a74c8d1256731cee78ef6966ca03f51f025690db0d64aeca16d5a2fc1700c613060b0 SHA512 42bc14254551919ba4bb9a1ed2abe644e0960736d4afa652bea3af0ebf0cc195ba007802ceac71e5b6a86c1345bb2832387cf7f2af1e01812c129e6498e44fc2
+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.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild
index 7ab742c6848d..6fd05c710080 100644
--- a/app-misc/digitemp/digitemp-3.7.1.ebuild
+++ b/app-misc/digitemp/digitemp-3.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE="ds9097 ds9097u ds2490"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="ds2490? ( virtual/libusb:0 )"
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 40a4aab98546..48abec91ef57 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 2423 BLAKE2B 9a130d2e5d451f1bf4290dd5b6781b5612beed093bbf912b18d5ae0f0d289a233a36d767d58f70496552bea6ad8c45c64e8d76c1dea645f9716f9af37d95f168 SHA512 4252a2e3cdd0b081aad94b110bd692886ffeca6e48ea4c56b8a40c081396cb095e4d96f6af93213cf6dd406a4373d4e93800248a6fef68a3fdbbbb36193c4007
-EBUILD mc-9999.ebuild 2677 BLAKE2B 343e80aaeab6142e07612d179ed6639c4a6675211351c705f2ab2e52ae2c7cd268590e144f9c8cf7a4ef2e33255c3323b31f8d3e5cd365f99483918706924990 SHA512 4af49a3dfb63f3ac62bbb05ed9d35672685dd16f14e750656d4c2b7924807d324032221c73629f854b01a6263da32ba8ed018d244e1a04146b96fec6a753fa0a
+EBUILD mc-4.8.22.ebuild 2638 BLAKE2B 6542b9377431ae066c4c7a74b7af17caaa6e8f61d9a4bac4f4fe5193cea229c900486e78c8007e4b3afafeba8156ac36dcdbdcbe32dc8b979cbae3e0d42c2fcb SHA512 5eeb78c0775342e68d6c3da8f9f51228489ca2fba087146ac20f9bf0b773eab2c478ecad9575b7dbfc8fab998ef99cd6052603e23b0f7e4bb1e158371e9a2c46
+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 e2a128c7a3d3..7fdb6ba9ca13 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 )"
@@ -70,6 +70,15 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS README NEWS
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 722ae657e0d8..d27af1106ec4 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -83,6 +83,14 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_test() {
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS doc/{FAQ,NEWS,README}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 342cdbf328a1..84be6c1284e9 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -7,10 +7,12 @@ DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321
 DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1 SHA512 8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
 DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311 SHA512 4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
 DIST mosquitto-1.5.5.tar.gz 431998 BLAKE2B d6963235c70fd5ad1f73ea6964e800041afd6fad89a83f3d2c5fd6d843048f328dc93368c99e83820f110dfabd56783fa175a1169bc75316331df62f846409f3 SHA512 4984a8c3a48450ae87dfca9ea825433332c22a5c1b214b7c6d134789675431ba1bcebaceea2fe32c5d32c91ec47b9ded7b61c0c2caf6551f10e4f8dc455a5351
+DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c SHA512 99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
 EBUILD mosquitto-1.5.3.ebuild 2439 BLAKE2B ba9acadf951e4952a0c139ec4f37bf72be33d7c32519bf9bcfa0399ce43861d1ce4d0c258266f39d1c0fbc37d4b818a25af564e3ee787d4b70b3d80d7354e488 SHA512 2feb2ac21f4ee9b4b3e46e6eddae71cccd5552e5815e2ab5ad50bc967059572a3c3b1791505c58a5eb6ab00cdb7926e78c9adffc38ed4ed6e74d84000df6bd07
 EBUILD mosquitto-1.5.4.ebuild 2442 BLAKE2B 139888e22d3441c68fe5901abcf9247a9db13ce8f51389db78ef455bac0ede577b76463651898da6aeefa66615c47c885c4bf55d9e7fbf04f043ad62ad58c1f5 SHA512 cb71c209ebb39f2a5cce3cca59c50aefacf274795537f9b37728ca90d41105e41ef9b34c5f9d891b2874e08e192791ac12fdf172e616c4d685415feb2455812a
 EBUILD mosquitto-1.5.5.ebuild 2442 BLAKE2B f91a39e79de01c819dd6f1463414d57a598dd9d89e6e08d477bda35b7e55d6f4e70870435af614aa207cc91e8c60333df24441b445a2bfe73013dd4bc448e461 SHA512 7b17165cbce5fa17e956bb939ac96110e5076ce4210e4aa7bbd488520012658de96434c1bec24a0f57b58a3b6f55b00ad2072c96e3936b1fe2df4b68202305a9
+EBUILD mosquitto-1.5.6.ebuild 2442 BLAKE2B f91a39e79de01c819dd6f1463414d57a598dd9d89e6e08d477bda35b7e55d6f4e70870435af614aa207cc91e8c60333df24441b445a2bfe73013dd4bc448e461 SHA512 7b17165cbce5fa17e956bb939ac96110e5076ce4210e4aa7bbd488520012658de96434c1bec24a0f57b58a3b6f55b00ad2072c96e3936b1fe2df4b68202305a9
 EBUILD mosquitto-1.5.ebuild 2553 BLAKE2B e24122599e0d670a92ee3a6b1063d0bd5eb342eae27ea2029f4a60b5e3ddc9c9c98fc07d7cd980ac1d72b9743e7f964210b05f7131101e8330d7974096006df3 SHA512 c73492cff20a123be5122fe37d9c0c4a12ec86d0dac6c18c8257d8999aa31d1696cb4524d5e13bd09d71a6be1545734f1b5cc4d367b65de3aeed11679c9a6e7c
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
new file mode 100644
index 000000000000..30791550cf93
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	srv? ( net-dns/c-ares )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	websockets? ( net-libs/libwebsockets )"
+
+_emake() {
+	LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	rm test/{broker,lib}/ptest.py || die
+	python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto "/usr/share/doc/${PF}"
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The Python module has been moved out of mosquitto."
+		elog "See https://mosquitto.org/documentation/python/"
+	else
+		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+		elog ""
+		elog "    rc-update add mosquitto default"
+		elog "    or"
+		elog "    systemctl enable mosquitto"
+	fi
+}
diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
index a6b1435be4a3..66ea86d37d0f 100644
--- a/app-misc/openastro-data/Manifest
+++ b/app-misc/openastro-data/Manifest
@@ -1,3 +1,3 @@
 DIST openastro.org-data_1.8.orig.tar.gz 16045562 BLAKE2B a2528faef9827249e01c92e7cfb96565676ed68945bed24a2927c9844fdedda980c9afdc06c4a88765d3aa31a2559fa5cec06381f90c27a244ed16b3f05e8f3a SHA512 79e2fa921b883400e29bcd7be3cf3f791d60ea164e3062b61e95608ec815aa3e8df093712658f71c45b60259ffe41531d32f4b65db5e7f642b63f267e9cce7af
-EBUILD openastro-data-1.8.ebuild 557 BLAKE2B b5cadc16f1bd965ac09a81a5674cb1f9cdfd47bed73b3ae10529b70c3ad626a802bf2c90f71b10c77b6283289d000a532fad6d3ae38dfbc14d02544cef72595d SHA512 e6955a4f9486e4a56147ea74fd70f72d348ed03e964f84a1a2aca54b5012bb11b62fb19797302075d90f83c6539212f3146e4a0690dac3b2d1f4c1eade1bd088
+EBUILD openastro-data-1.8.ebuild 528 BLAKE2B 0c72c093df42370a0e3038dfde4f7cb605f435327a09e77393a497612ad35c25de22af866c3a4dffa61adae52462c2554961f68dd415299eb9283a8d20859c66 SHA512 17b3fa3b5bed016ceecd31cdbc82ab192143a234cad29c1b6f1e01cab63752a4e2bd6ada4c6d71cd608367eb0352fecf8aee300273893f0944f956ec5ba2d174
 MISC metadata.xml 391 BLAKE2B de44378c992fb6a7cc3fd16c2cec319b49dafc0da73f06e41ed08e48a57b97906f2e488bc2dc74d8850800762c3c70de3281af436dadf67d8a60b30226c795c3 SHA512 33213a04e12838729bdce8d1db7a395d337dbf65f9b00bdb3fac1f7a0764efd615a879942f03d9bec6476026d1fbc81e69a096bcd3831adada5b289bbbff483e
diff --git a/app-misc/openastro-data/openastro-data-1.8.ebuild b/app-misc/openastro-data/openastro-data-1.8.ebuild
index 34fb99b46590..f864371491fa 100644
--- a/app-misc/openastro-data/openastro-data-1.8.ebuild
+++ b/app-misc/openastro-data/openastro-data-1.8.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,14 +11,11 @@ MY_PN=${PN/-data}
 MY_PN=${MY_PN}.org-data
 
 DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
-HOMEPAGE="http://openastro.org"
+HOMEPAGE="https://www.openastro.org"
 SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-3+"
 SLOT="0"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
index 60abbd6db30f..2951ced98cc2 100644
--- a/app-misc/openastro/Manifest
+++ b/app-misc/openastro/Manifest
@@ -1,3 +1,3 @@
 DIST openastro.org_1.1.56.orig.tar.gz 212271 BLAKE2B d0252ae7f3c4c4f255ab1e402f3491b2b61e295f2d2064bd6a25ba07424526cbba01f2fe9f255eced0037b4d05edd1b0cde2e0fdae5c0fd7849652d5f8bfb1c7 SHA512 0446575bde71ca5bc88177bf1d5b8088cd1bb8e29ecfbd83ff15ebc4da4f07534c987f8a00b555a0af85c613e5d6bd2cec60898b586110c2230570446e4b7f2d
-EBUILD openastro-1.1.56.ebuild 919 BLAKE2B 21726da473e1e56e06512ba566d1457fd4a5f73efc8d073bbecbcdb25eeb7e505ccfe7da7d50dacbefa32d3d3b161029cccc8c41760788a4ea54be6b2edfcb84 SHA512 684758d970d7515c5f82a8f137fa805376103221167f067584efacc42f57c157c996d255e3759a2910e1244d71b3d8bcfd0385f9888d7a1d7d04dbe4328c4ad4
+EBUILD openastro-1.1.56.ebuild 921 BLAKE2B 965b2afe7217df4b226876052366c3f7613074aa5d7e7fa72ce5b466628a9987cb817b4d981b2c06d2c9c2fe93a088dbe7245ade2061681446339d4c31ee1938 SHA512 53961a5e1fd2b3e113cf1a5bf2d708fb0d4c4fad56927cae5b41e29a4586ff34ddd160f85897d4f42746d9b49f7d09d39c9ae88d11bb07e8d79d9abf377bc3bb
 MISC metadata.xml 554 BLAKE2B b7e8a99695365047f82469d977834081f033f7742a56a376897455e1b87acbf305454088dc9102265747b67f327733a74386e2d0e04c2f8c6d521ad44bd40bee SHA512 4c226c8e6dc6effd387a8fd9af0c1f52b471e90c4fdca04d37b291fae787eaa7d390bca12c0a5095bc2a242ba32daf80005ac69ea48e3764a0685b1974c88301
diff --git a/app-misc/openastro/openastro-1.1.56.ebuild b/app-misc/openastro/openastro-1.1.56.ebuild
index 1a0a8770f703..1338e8e212f3 100644
--- a/app-misc/openastro/openastro-1.1.56.ebuild
+++ b/app-misc/openastro/openastro-1.1.56.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
@@ -10,7 +10,7 @@ inherit distutils-r1
 MY_PN=${PN}.org
 
 DESCRIPTION="A fully-featured Open Source Astrology Program"
-HOMEPAGE="http://openastro.org"
+HOMEPAGE="https://www.openastro.org"
 SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index c851d63e0065..99d0b0cdb580 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -18,6 +18,7 @@ DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 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 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
@@ -31,4 +32,5 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 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
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.5.4.ebuild b/app-misc/skim/skim-0.5.4.ebuild
new file mode 100644
index 000000000000..ea4eeca24d46
--- /dev/null
+++ b/app-misc/skim/skim-0.5.4.ebuild
@@ -0,0 +1,75 @@
+# 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"
+
+DEPEND="virtual/rust"
+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/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index 5e1ef148278c..d166e68744dd 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,3 +1,5 @@
 DIST tmux-xpanes-3.0.0.tar.gz 45256 BLAKE2B 6637e27816af643498bb7523fcdd39fc5e9272adb83101a20fd5c77f0917ae832986b3f811dab2020b0906dd81808438b9dba5cef737d502a0d91d2a72c4de19 SHA512 2a7187ac7251211f7fd6832cc60182621ae12f40de30cb3826452ea0e8b032351a261d1b1e7d79d87dfea3bbe95fd5140157e1b1e1ff29492f4df489aaec4711
+DIST tmux-xpanes-3.1.1.tar.gz 51507 BLAKE2B 6fdf3a6cf7faecde33d9e51d6c40dd3b8bbabce1f63f7f5a0afb866d6ccece623c9867b542ba54b478861fbfc7472cd3b3bd378d577faf3d32eca88bf1e82538 SHA512 fe1fd5ef698c4069c4c5c078a10f602642b0c260a8cccd90796b79958fbd655f99bd69884978b8c56df20190b808d17e54fdc9ef40426707344038ba8601884f
 EBUILD tmux-xpanes-3.0.0.ebuild 694 BLAKE2B d5e0e6fe327ecc327c28cfd5260ac86d9b0b496827309264dd5fb4583456a4b667f129a4bde6c818119976a8705b75d0af7a05d13a1a6ca99ba728c3f11bf502 SHA512 8fc75b4d63f8f9fe38d90213fca7e2b1d4c45b24c5f8912ce606c9f00754b1fa7a6f26188d8ce39a388e59ef71fb5298aba871985651d92dee3cb72af1e8c462
+EBUILD tmux-xpanes-3.1.1.ebuild 693 BLAKE2B d09b06019b320c6c5060d67882c7b84786dcacaf120818411576874c5e5e72499ea06fa86e88eaa01c011632b2ac8f2cd5398368e8e1afba1ddc338c46d22875 SHA512 884515267c078174903d9b1e98661625d4b4faad0ab6689cac1d2522595ae21144c57d025cad76278c77887a56b006c90be7f2198cf118b22ceae24be8e98501
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild
new file mode 100644
index 000000000000..75d8c2d638d8
--- /dev/null
+++ b/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="tmux-based terminal divider"
+HOMEPAGE="https://github.com/greymd/tmux-xpanes"
+SRC_URI="https://github.com/greymd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="zsh-completion"
+
+RDEPEND="
+	app-misc/tmux
+	dev-lang/perl
+	dev-libs/openssl:0=
+	zsh-completion? ( app-shells/zsh )"
+
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+DOCS=( CONTRIBUTING.md LICENSE README.md )
+
+src_install() {
+	dobin bin/*
+	doman man/*.1
+	einstalldocs
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins completion/zsh/*
+	fi
+}
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 75486b65c08b..f84b3e11dab8 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,6 +1,9 @@
+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 4297 BLAKE2B f13dfcb5cde8c191b44418b04eed32830516f0682fe4d6f2ed47bbe5d577d94484672b2e8f24c7930f45d849d8e36c7978349e10181786743a6fcd92bb90aafb SHA512 7170e2269da3affaaa03bd7f7ff7bbe9ed883d7b067a03fb05a740f9e7d059bc3e68c5d483bf2b5ca0c953537f3a7d16e62a362e03f97c0442709585c01e2caa
+EBUILD tracker-miners-2.1.5.ebuild 4502 BLAKE2B ae176fccf4766badd611ac332798300fb9e530a9009541ce55893a20f931923f8fea7fa8c9526af1a038a1f5934e84beed6764882c3a06e1ee9e1b624f075609 SHA512 b7a9a87470333e6b6c69f8e9ee6f4b734203cfce5c22ca0fa94e0b5eeff1a4038b9579d997f28e741adc7e16f9acb38021674a01efa48562894237cb62a05396
 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
new file mode 100644
index 000000000000..580ecb34ba22
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch
@@ -0,0 +1,29 @@
+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-rss-symlink-fix1.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch
new file mode 100644
index 000000000000..9cccb2e36e9c
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..30fef51ca492
--- /dev/null
+++ b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch
@@ -0,0 +1,39 @@
+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/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
index 92999f830e52..b04c2c5f8c6f 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild
@@ -70,6 +70,8 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50
 	"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51
+	"${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6
+	"${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too
 )
 
 pkg_setup() {
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 20249aa73a8f..2751eb64e225 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -7,5 +7,5 @@ AUX 2.1.7-upgrade-path-fix.patch 1251 BLAKE2B ea343e15348ddfe8a8a36fc9060d14dc5e
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
 DIST tracker-2.1.7.tar.xz 2572740 BLAKE2B 0db8379502a37d0fc0c4b905a55a8642011c76368a94609b71afa5b6d59fa8a9220c302588a8217ea8626faccedd6b62e8fc96b19d4fb2cbaf1b550fbc55cf0d SHA512 75203af91ec43641caf2a3870100b8c5affb613e442e5a271edafe68ac7c6551256f288e435ce4fc8cb6f9ee0ea54871ebba90e085d0baeba4914815d3be15a0
 EBUILD tracker-1.12.4-r1.ebuild 7448 BLAKE2B b1552ee19ab27c1a2fb7ec5fa43de63f53f88da98d77772c979a4941bcff54299d991e20f432155652152d1b3315ffc64eaeed9073261c2f428c334f5f576e41 SHA512 b84d10c8f9979fe3e66007c7e20b229d181c9e1961a92aa70500c6461197ac4a976cc7849e4901107bb4aedb3195540ec12e577f9ab368ea4aa10059ddcf3131
-EBUILD tracker-2.1.7-r1.ebuild 2921 BLAKE2B 9632ed938972d26a439fb6891875cd3174118114b9344a2eef2e8e10f0392efcea50c055a61a3a9cc13e1bb7d75e51bb060ee5d9db3acacd00c3885ae5e58c29 SHA512 aee64e41dbf027436257a7ad391f1bb506314876d1038a20f700c062c4fa64ac9c7aacca1fd94ac8f5bd3cf43d4d139411f01868ffe732318abaf48f634ba970
+EBUILD tracker-2.1.7-r1.ebuild 2908 BLAKE2B 52804fce82218814125b5903b3f7546d1c443c0463cd6db1be9077e5be8e2bcd5d9dc2ab823709eed3530139f6b7fdcb47d8a4db9b8c7733d29e637fc824d1fb SHA512 f27d33944fecdcfc73fd62090ccd9474bb992a3d91eafc5817eef094344b2a3034252d57755bec9053ad183bd74af3fe6fddd668b26709c48859a99640432752
 MISC metadata.xml 1545 BLAKE2B 1fee1210e27ad5a33c7e121372a64ed7d70c5c8169ce7b2688ff395cb56a218d53a8c5561701498d52d7772be1ce77d44275c938ad9486dc039e2f301bb14b6d SHA512 b379f0ca9737f7847ec7e0e83148ef354a56433d5fcd45996feaa86d9773c60b97f226ca21aba48aaba31f17ead8ea1922d408193328f477d58449ed3a732f71
diff --git a/app-misc/tracker/tracker-2.1.7-r1.ebuild b/app-misc/tracker/tracker-2.1.7-r1.ebuild
index c9232427a4bc..3d59f4f66b6c 100644
--- a/app-misc/tracker/tracker-2.1.7-r1.ebuild
+++ b/app-misc/tracker/tracker-2.1.7-r1.ebuild
@@ -42,9 +42,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 " # g-ir-merge needs py3; functional tests need py2, so disabled for now due to mixup
 # intltool-merge manually called in meson.build in 2.1.7; properly gone by 2.2.0
-RDEPEND="${RDEPEND}
-	miners? ( >=app-misc/tracker-miners-${PV_SERIES} )
-"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-doc-options.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/58