gentoo resync : 24.03.2019

13 files changed, 148 insertions, 519 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7d935b4cce95..dfd1e6c62ad6 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 73f2ff03e55d..4ac400bc2f2d 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -3,16 +3,6 @@ AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d6
 AUX mosquitto-1.5-fix-socket_get_address.patch 1024 BLAKE2B 72cda074a2e609f4e67b22c8f40ca924814ab8b5053afc5860b132ecae0929f0d721aff7b8db0095abc23fd506a1a47b2398ea16cf21b5bada3d1e1b6c24ad35 SHA512 1e8828232ff795aab47c22f0d2bf380d71c0962acb2aa7f421c3618dc9476fc2ff58ddf9b3add33fd59f878d0456bbe0682428552cec1129e2b9a45431c33205
 AUX mosquitto-fix-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
-DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
-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 2439 BLAKE2B 2bb3e7450ac56503fa7988063404ba9faa7be782ed42c97a5992120f731c20f603de73df492d8fc61d747e3ddf587d0352a09f1b836903cabc9f5df83c97197c SHA512 d141952980cc6e898f4cd2fcc5b40dc19f3147f952cb2538cc34ec43f92a0999b786add93672cf62d4251b6e0cfd6b98493385cf4fad68dcaeff611709b63fda
-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.4.14.ebuild b/app-misc/mosquitto/mosquitto-1.4.14.ebuild
deleted file mode 100644
index 04008dcbd0bd..000000000000
--- a/app-misc/mosquitto/mosquitto-1.4.14.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="http://mosquitto.org/"
-SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="bridge examples +persistence +srv ssl tcpd websockets"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	srv? ( net-dns/c-ares )
-	websockets? ( net-libs/libwebsockets )"
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
-	if use persistence; then
-		sed -i -e "s:^#autosave_interval:autosave_interval:" \
-			-e "s:^#persistence false$:persistence true:" \
-			-e "s:^#persistence_file:persistence_file:" \
-			-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
-	python_fix_shebang test
-}
-
-src_configure() {
-	LIBDIR=$(get_libdir)
-	makeopts=(
-		"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)"
-	)
-}
-
-src_compile() {
-	emake "${makeopts[@]}"
-}
-
-src_test() {
-	emake "${makeopts[@]}" test
-}
-
-src_install() {
-	emake "${makeopts[@]}" 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"
-		insinto "/usr/share/doc/${PF}/examples"
-		doins -r examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "The Python module has been moved out of mosquitto."
-	elog "See http://mosquitto.org/documentation/python/"
-	elog ""
-	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"
-}
diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
deleted file mode 100644
index 46cf3f99a9ee..000000000000
--- a/app-misc/mosquitto/mosquitto-1.5.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 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/mosquitto/mosquitto-1.5.4.ebuild b/app-misc/mosquitto/mosquitto-1.5.4.ebuild
deleted file mode 100644
index 44c2e14ee223..000000000000
--- a/app-misc/mosquitto/mosquitto-1.5.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 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/mosquitto/mosquitto-1.5.5.ebuild b/app-misc/mosquitto/mosquitto-1.5.5.ebuild
deleted file mode 100644
index 30791550cf93..000000000000
--- a/app-misc/mosquitto/mosquitto-1.5.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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/mosquitto/mosquitto-1.5.ebuild b/app-misc/mosquitto/mosquitto-1.5.ebuild
deleted file mode 100644
index a2251b4ffda2..000000000000
--- a/app-misc/mosquitto/mosquitto-1.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-conditional-tests.patch"
-	"${FILESDIR}/${P}-fix-socket_get_address.patch"
-)
-
-_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/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index eef3d66d0c66..ef23857857bb 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,5 +1,5 @@
 DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
 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
+EBUILD pdfpc-4.3.0.ebuild 1013 BLAKE2B b9e65e5107ffe73c3b5b0695b1c212ba69d8c8862ec96155b5fb10bd83fcb3887076f429aa465a0ac31e1c1fce13e7b4fe487765d743cdfabb3b355290e63265 SHA512 1fb3bb7bd72df39347026613db652405dc074629a04284bab4165899b7a3a1d689c5f5429d84259c022021a079000f45bd3fa3c60b385b5189ef2bad308bf85b
+EBUILD pdfpc-4.3.2.ebuild 1040 BLAKE2B b6eb02ef0d0778c538111f6ae3d83c838f825a5df5ffc7c18944f4f5348bc3e0de843fe15306dbdd9529c9cfa4bdc83ad3ea971d1d79df7d0d87c4caa1db4d22 SHA512 cd4622a15da56d8c5dbe68f8523dbbd7e948eabeb34b0ef8c57fe41efbe1e52163e9f2b8c9d7b9042d4015c1724db2c19f61d80477841d949782429d8e4b8008
 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/pdfpc-4.3.0.ebuild b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
index c7c93c172f18..2268d0460d91 100644
--- a/app-misc/pdfpc/pdfpc-4.3.0.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
@@ -9,7 +9,7 @@ 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"
+HOMEPAGE="https://pdfpc.github.io"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/pdfpc/pdfpc-4.3.2.ebuild b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
index acb64556e3fd..8de1c1444c14 100644
--- a/app-misc/pdfpc/pdfpc-4.3.2.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
@@ -9,7 +9,7 @@ VALA_MAX_API_VERSION="0.42" # 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"
+HOMEPAGE="https://pdfpc.github.io"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index b106cc1ea80a..249e8439cb08 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -1,3 +1,4 @@
+AUX 0.6.2-cursor-fix.patch 751 BLAKE2B 97613f5e0c6e4f302ebdf3aad6791a59159854ccca6c85661a3f7de4408120ec424942e1a2891d1d36ca1bd6be79acf45794d3437331e208e3994c8c8f181b20 SHA512 f1dccba68d6a43c5af71b2042b56d6c7e9e256ab7a5c9f0cb27e243d9f6bab48b9f5083920cdd04b8fc5ee181015c184dba8ab33d0b38f8f43deb6f826579206
 DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
@@ -17,9 +18,16 @@ DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e056
 DIST crossbeam-deque-0.2.0.crate 12638 BLAKE2B cbf76e49fee9e1274e295f0958458a6f8f6f0bc449a83011da3dfc64607a649ff6a72102b9ff7784e0ce2b33bb317e4a927eebb749bb9cf31a7ce89e5aca8f7e SHA512 22a1b839ecd4359e3c961e5ff0a044f6f2bc14b5ceec4637c57bb5d26ad04840b0dc0a07f06b494f4b7e224f2a51e3e9a79bf7f895a73179a10705481b33d8a4
 DIST crossbeam-epoch-0.3.1.crate 33093 BLAKE2B 915d28d3040232768a60956eaa3d574206ae7664a53af3a993acaa9fac0cca50af321923c3be71d2d1799b7a0d4eb617ddace861644a3c8b067ca360aacab34f SHA512 8fc0641701fdb1d22fa60a5408aff96bbc296b975e6f9644859295abe6ee4729d86ada81969a51a09a7a8518f287ba41fdb258dd0143ce8d7db5abff604b955b
 DIST crossbeam-utils-0.2.2.crate 11901 BLAKE2B d089d4d810d3c29163a9c3007c5c3a2479901c111905182df0c24b293853e37107693ee0fb50f0984bb7dae76908a66f1be402222667fe1eec31319e5c6e9979 SHA512 fc49d36efcb3a53125c1173415e27de43970c1d2f32547687e02c99001c98cb200047bd2b0072e47466515df5de9ee2104d1b83e7b4ccf03f0e3580a1d416f32
+DIST darling-0.8.6.crate 16146 BLAKE2B 4c7d19ecdc6fb1e19aaf48b0237fb16c06a6eb7458fcfc52d03457ca673b9b382b10fcc348da14418b4105b5498ca5bcfee4307b9d75f0a1ce70705887b5196a SHA512 c1b28f6c32e2e2bc7dc0710c0ec6f400a3065573fa9a248e069f17c4315d2594906aad9486abda32508acc9f3ae2b4014eb5119352fe37b92e2b344549e122a6
+DIST darling_core-0.8.6.crate 44024 BLAKE2B 6f623cee39ccf274eadf5a0909afb7a65d94e556d9cbe6fa5e213adf73f97ae732ee0f64244ab6fd6e0c9bf8d06077c1496f184cea8e5288d1b8db620c92ff98 SHA512 d0d5983ff11d47b469d64b2ee6ed3e0c493e5a847ddaa97244b8eea9ba00692980ca4fffb91029dd079db7c7a31790d8904e06855205edc4539eb2fdfddb6666
+DIST darling_macro-0.8.6.crate 1924 BLAKE2B 73350f7ef0ef8e28706ceef8d50e593ef982a7762e1a3a0312e0280182f777ac0292a571f07cc2d468fbb6b4339b7cb0d73658ff09c7bf796928071e0c87f602 SHA512 94900319d079500fc9cfdbf5fbcb53c15d825cbc8cb7a50519cc8e8584871d2a9cd340277b60d85bd261c2bf2628fe5e3ff0d2f74b0b36a9e0bf404fee8c6e33
+DIST derive_builder-0.7.1.crate 30908 BLAKE2B 5bb18cfe4af9ae479f0ce0c23e23fb4e93fe639dbddf6da0860ff2f7f4951d4d976288726d9f7ad863d7c58c2bc44cfdca7b876eef89c7290d9b6df4c43bc179 SHA512 367b7f66c593bfac2b2271e2d55dfb1418d485dd590ee0631cf1297e6d37b66bc6269d7b8c859b24f8e70c76b37e8cd047d463eee18f8013b1aed5b454fe63bc
+DIST derive_builder_core-0.4.1.crate 17157 BLAKE2B 56a1ff198fb5fefa1186fa829eb79ddbbaf4efef191cc56ed41950a8e32a27bf980994a41ebedb84fa6432d10d8ed83022a95a858daa8047fa5570aad66f798a SHA512 abb287b29f4c47741c7f8cccc7d96d23312f2880011a428613562de387326c76b15aef7e9449de3fa5c8f471330fe42639b9f06f7b9ceb16256fd97df764db80
 DIST either-1.5.1.crate 11532 BLAKE2B 3cb46de61309efeedb614c20a83bdcf2c4de024fa1ca4e6e1cec6384445596cfbf2c9d7a9712faf554a373eaa462835b455d7b2a908a99e99ae1c738680778a8 SHA512 268d218b10ed7cabbf1a116afa22ebe47791303aa012a61676d04376961156983374490d3d939e5d68b2ccf3a9c56f41eb9c9651cf81ea1294ef275dc898733e
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuzzy-matcher-0.2.1.crate 8135 BLAKE2B 9fa6417a90190905b0c563d2f629a77f4a711c4c87eb2600b2411c00f11b125b2fad346be02ef30fbf21c0e6d0ae068f89baf5b300ba61bf705c4a4256909687 SHA512 c177eacbbfb45bcf6f607e0d421da18eaf4c25738a26fd553574901be2e9f5b9fd877f4886b0f6d68050dbd7a04d37f73420648fa3e122f2a18e26794865b63d
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
@@ -34,6 +42,8 @@ DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea60
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
+DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
+DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
 DIST rayon-1.0.3.crate 134391 BLAKE2B b0f938ad39bf8772374d312893097bb91ee3886e79f6c3050658b0797fad55f309d03d99c3f300837e86aa28f4b5041d9cf7dc455cb418fb4d38b678e8063a10 SHA512 bd23dbcd8b17061e0623df01af141d0e51532b46ef360ddbd392f4992d6b62fda26255cd9908f853a5a4c3cf111f6c9224a97abb0a3f9754aa0ed79ac58392f7
 DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2e902b5cdf88730dd57e84248c8474c5cfc5dedbc66322b996733bf404226c0d2694fd7139ae9706a822f567d3c SHA512 4d12b8097356d0a9eac8b3ca64085de8d19360dae81b3ccb199275c3487f705e2aded498e819958bb81d4de56c05d4d29c21c07da02236ba6fa0b2888ecfbea8
 DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
@@ -49,8 +59,10 @@ DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde
 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 skim-0.6.1.tar.gz 80538 BLAKE2B bff6e24e0c2b8461cf61f7f1e48f96ba0a353e39de0f4ead0ae40748286d666955f35cf3e088fc4253b9bde97784321a9636c0cee20fe4039782c57acaed8b66 SHA512 7fba58012cdce94f8d55afbde1ca8a4adcf07a2e4bf86da58b54cdc31fe700824ac7a16e1ea9558bd5f74ed21f8fda25a50237c68c4ca8ded9e9935570386ad1
+DIST skim-0.6.2.tar.gz 81573 BLAKE2B 91843436748456d513e4abd19682ce329d4971ef9d989a7c059088aeaa4274cb2fe4d38760102f3c16bc6638a2b0f1162609a5a3531c8a75bbba508e957fc487 SHA512 47c89b9f6bdbbc3c470c4edb5b23fcf94165cb34ab7be4de6113b4eb4433d81064395c5495d2129c7877dd8ed3bea9067f1d2b965fd7683c39aec1bb070b7b3d
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST syn-0.15.29.crate 146203 BLAKE2B b9280bda7735dfc08f80816e5db9c22e27596e5bfcbc54accd37a9bc4899c2caf1bcef03155c653441365ed9fc8cad910fa47c58ba7a386b3fc9f40b4be59a27 SHA512 1a5f365a8239758c9a2e2cfac3bac1bc94995ea48eb087cc8a2dc62a33a2f22b2bbe2985e344fdd758021ab66e55ff17e76c0234e9ae342499d1ae1fc3294767
 DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
@@ -60,9 +72,11 @@ DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78
 DIST time-0.1.38.crate 28500 BLAKE2B f0d98a7288616c2a5a07691e6bfe2bed5b043c9ddec3a6658e2e1dde294af030b635aba1d8c408f0cbe3c4c2692d4e2705d91276fac0c63f5ca03d3be3b19b59 SHA512 9052d6bc6c9222d331d23f7cb79b534bea6b1cc0f259c97f465321bcdad11b643cbd2e9bb3a456770a19a2a84dabfbab55e522cbb745f4c64e228736eaaeaf24
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST tuikit-0.2.1.crate 31554 BLAKE2B e07173a3dc76110a905c448291e2a9f5b75bc963a47349744700bab7063a9b652eaf66ff2bf242280c76c902d914baf474076c7c5a531a310a1dc54bffe619ac SHA512 1aca6f200f15765191d46fb136486eeb3da70ecd59ad7716769ffe41950020f6eb36b365ab1c7f7844ba07f0e75f7c4644611ff592ae316fb9fad139b64e8f06
+DIST tuikit-0.2.2.crate 33081 BLAKE2B fd9f918d8fffd424d67975975a17a2c3e11c9f87ff1f790e3c5eb09de609e78980cf63b76ef3761b8061473eced6801dfddb52d891a0e3bc864e7be7cc1e3369 SHA512 fa9b6aeebb9e3ea93ec3378c76e11d9f86fa17be1d4b36b3bb9ff4c98ea3ab8f020e4464f035af9f5e4c5ee44ce1d4fea1871d5c81f025666e19e5c5f8c18ff9
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
@@ -80,4 +94,5 @@ EBUILD skim-0.5.2.ebuild 1353 BLAKE2B b9ce81124e4cceb55af348e45105bb5cc55ff1e212
 EBUILD skim-0.5.4.ebuild 1389 BLAKE2B b7a979df15c653f37dbd805e6d34095ce47f8869e355699c476febe75d51dfa61212a4153c6ba2de8ea2b8dfb6528272259a2b884aac1f95bb0e85c0ddcd2067 SHA512 eacdaa3d57aa3c362ff48541ad81c4d234549e03255be1b217e88c81c343f2af9259747d001031bc44a3c734f29b356ec830757984094f06e3216bf8b62ccbae
 EBUILD skim-0.5.5.ebuild 1367 BLAKE2B 200e4fdb046dbb5f16316e9c7dd390393fedc184e76d5a061b0ad1b65ad18171f76a49f334bd3ceefef41c4d3a95931bc375973c8fab804031508b8e54d0e444 SHA512 4df3904246b2f25ffed97eace185604786c412c0420433ce51352ac071148dd9f08e619e654e49436949662c25973534ae18ec01972e936a2d78ba989b9b456f
 EBUILD skim-0.6.1.ebuild 1719 BLAKE2B 21d717b7f668b831d6083f8c4d3a54a080af950cd1adc766755b988942d9d38495099c70b1c627dc176e41f0b606b80630b1fb0e3ac58b3b3211f0ef52c3a399 SHA512 962b02989aec4a4c30e4dd13701bb18639dbff162b5b9018fec982620bcb3ba02267205e9c0831a332b9d07da9cf3dc42d9902f67ca8a47c3a5c8559a0a37080
+EBUILD skim-0.6.2.ebuild 1958 BLAKE2B 9b60aa155f88be08f85fadb8eb066ea4bbd7fc9bc48ed9284ce38841c2a9fc239420b717867848a0ef4d533b81b76bea0986b67343fd26480eadfd037ebd997a SHA512 222d9595e2c46751fa3069182582c0cecfeafeaa328fc600b80d4074a367df49fa70cf45bd86b0685b36e358de6d62315b273586140e544f0acaca2afd654684
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/files/0.6.2-cursor-fix.patch b/app-misc/skim/files/0.6.2-cursor-fix.patch
new file mode 100644
index 000000000000..82fcccdae536
--- /dev/null
+++ b/app-misc/skim/files/0.6.2-cursor-fix.patch
@@ -0,0 +1,22 @@
+From 9b5213da447eb8674570924026689d89f83ce9b6 Mon Sep 17 00:00:00 2001
+From: Jinzhou Zhang <lotabout@gmail.com>
+Date: Tue, 19 Mar 2019 22:39:05 +0800
+Subject: [PATCH] [selection] fix cursor after items changed
+
+---
+ src/selection.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/selection.rs b/src/selection.rs
+index 626f615..72d277e 100644
+--- a/src/selection.rs
++++ b/src/selection.rs
+@@ -98,7 +98,7 @@ impl Selection {
+ 
+         if self.items.len() <= self.line_cursor + self.item_cursor {
+             // if not enough items, scroll the cursor a page down
+-            self.item_cursor = max(height, self.item_cursor) - height;
++            self.item_cursor = max(self.items.len(), height) - height;
+         }
+     }
+ 
diff --git a/app-misc/skim/skim-0.6.2.ebuild b/app-misc/skim/skim-0.6.2.ebuild
new file mode 100644
index 000000000000..ccbcc9df45b3
--- /dev/null
+++ b/app-misc/skim/skim-0.6.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+ansi_term-0.11.0
+arrayvec-0.4.10
+atty-0.2.11
+bitflags-1.0.4
+byteorder-1.3.1
+cc-1.0.31
+cfg-if-0.1.7
+clap-2.32.0
+crossbeam-deque-0.2.0
+crossbeam-epoch-0.3.1
+crossbeam-utils-0.2.2
+darling-0.8.6
+darling_core-0.8.6
+darling_macro-0.8.6
+derive_builder-0.7.1
+derive_builder_core-0.4.1
+either-1.5.1
+env_logger-0.4.3
+fnv-1.0.6
+fuzzy-matcher-0.2.1
+ident_case-1.0.1
+lazy_static-0.2.11
+lazy_static-1.3.0
+libc-0.2.50
+log-0.3.9
+log-0.4.6
+memchr-2.2.0
+memoffset-0.2.1
+nix-0.11.0
+nodrop-0.1.13
+num_cpus-1.10.0
+proc-macro2-0.4.27
+quote-0.6.11
+rayon-1.0.3
+rayon-core-1.4.1
+redox_syscall-0.1.51
+redox_termios-0.1.1
+regex-0.2.11
+regex-syntax-0.5.6
+scopeguard-0.3.3
+shlex-0.1.1
+strsim-0.7.0
+syn-0.15.29
+term-0.5.1
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+time-0.1.42
+tuikit-0.2.2
+ucd-util-0.1.3
+unicode-width-0.1.5
+unicode-xid-0.1.0
+utf8-ranges-1.0.2
+utf8parse-0.1.1
+vec_map-0.8.1
+void-1.0.2
+vte-0.3.3
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+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"
+
+PATCHES=( "${FILESDIR}/${PV}"-cursor-fix.patch )
+
+src_install() {
+	cargo_src_install --path=.
+	dodoc CHANGELOG.md README.md
+	doman shell/skim.1
+
+	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}
+}