gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-misc
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
39 files changed, 662 insertions, 610 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bebe6941c4ed..7d935b4cce95 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index 4c1a99d70f9e..9bcec21388c9 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -1,3 +1,4 @@
 DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
+EBUILD bgrep-0_p20110121-r1.ebuild 808 BLAKE2B 98a07f22d204e446637044b18602131109ecea3461aba61a32c0353fda032efb879567018b3941e6022b6e095f95c0ab14b9c0ea1bcbea1cca3c58507c1e6ee1 SHA512 e8730552f2254833d720425a0c6030348ff5326d0456dfe3a7c920bae0b903b1869f1aea87c698e762dbe9c2ba985473fbe4689f3f93c5df083e93a848d39041
 EBUILD bgrep-0_p20110121.ebuild 802 BLAKE2B 761e1c90982e7f28dfbdc7bc7a50502c5bb281da5040e2a5862cda1074fdfeb9fd2cb41f07a78c6580aabbc7c61cd80ea8c44a97125123151821fdaeedbddf95 SHA512 80116928aed3848cc394c084ee948e15ef9c95bb3ff8ae32ce34edeaa1459ba0eb2bb575ba95b8d13366599edfcb594b07ca741ab0fff94e587c0af30f4e7ddf
 MISC metadata.xml 220 BLAKE2B 3266a815602daa2a9da84d288e47e3328b40c967d40a801ac459539c015dbbaabe39c76945bcfe08b6499b05a2f775ea3b3094dccfeed7b62b4644f26ea4185f SHA512 be16f2417515008d47237f4a9de2584a23d02c4f7805b7b14887032db3ea5a9f6b1d6eabef07e415307f18ac4a1c08565a068a55cab9167532c0080395f207bd
diff --git a/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild b/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
new file mode 100644
index 000000000000..bdcaf0ef288e
--- /dev/null
+++ b/app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GITHUB_USER="tmbinc"
+GITHUB_HASH="49b098be9548d174023ad05c10f6af9d02b8e18e"
+MY_P="${GITHUB_USER}-${PN}-${GITHUB_HASH:0:7}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Grep-like tool to search for binary strings"
+HOMEPAGE="https://github.com/tmbinc/bgrep/"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${GITHUB_HASH} -> ${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE="test"
+
+RDEPEND=""
+DEPEND="test? ( dev-lang/perl )"
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp/|${T}/|g" \
+		test/bgrep-test.sh || die
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_test() {
+	cd test || die
+	./bgrep-test.sh || die
+}
+
+src_install() {
+	dobin bgrep
+	dodoc README
+}
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 4e337c8ec778..808561ad2d0f 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -3,7 +3,9 @@ DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee
 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-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 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
+EBUILD ca-certificates-20190110.3.43.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.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
new file mode 100644
index 000000000000..5bb10882fbc3
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.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/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index f2880767ed8f..13ab523a0d30 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,15 +8,9 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.14.tar.gz 33898195 BLAKE2B d153ec39f2e74f9a600f6a12d609d24999c08d0af4da521865f1c8fa22c642d57bcf24f4907e390399c538bc14bef17862759be7e9b5362a283f9aff1d3ef672 SHA512 d384797c652d5ceb2e081c3a05d62a8af3c543e818fa501bc0caff0826e6a56447f0dfc03d1e7391f7eb043e500c8a9942083bb141d18a02d464c5e5d8011bb2
-DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
-DIST elasticsearch-6.4.3.tar.gz 97872736 BLAKE2B e8c5db4f7238afccce4cf1ca0eced7b7e97891455cd28583eafd7ba028ba3cbc3596cedb2dc4267e677b3c7bbd459b8144284eca358f8c0e34a9a0b8a33426a8 SHA512 2f48720fd1644b1d0f103ca93bd19632c2a12bd3c94434ddf58bc692cb0b23631222f8d23cc0d0e85e271e11099fe0fc8aedf402906b76845ad680eb592f8987
-DIST elasticsearch-6.5.4.tar.gz 113322649 BLAKE2B 876dd23f80e24390e4efa1aeca6fa5791e3320a292d60d1b7628c685d1a3210f8ab15b78013ccbad5e589bf65fc05153ee810a1113d6ab9b2bfe62a335887302 SHA512 dcd6afdac02cdacdd4bbb3d9f73bffeb7a93750b35f5a5a991dae6c7d9f8883e33401ddf3096346e008047bfcf08d09435ea5f0290e717ff3a041600ea088584
-DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
-DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
-DIST elasticsearch-oss-6.5.4.tar.gz 34267092 BLAKE2B 18a35c4556a93d953665c1b740265c539e9f7f2232070a2ee9a0419f3c4b09748f8661bb53c5c785b4a26b001060a8b8bf96f4fc50af3a9252380e89623c9253 SHA512 1835aa2862104d328deb5bfcdbbab5d121cd8dff883b7f56f14cc4dadb88c7560b688ac21fb51e0d086b6ed07e0345f26de91c2887253b40abf23c4d5e37e197
-EBUILD elasticsearch-5.6.14.ebuild 1686 BLAKE2B e5a66c3eb054f849bbfbc90abcdd8fdb8b5ba8ea69ddbcc8f2d9964ad70864cdd094c29480728c8d5b830184289fcb2a8c9efcefcfb6c026d7a5dfdd2f211497 SHA512 4e6f1a2478e0cfe515add2c63f6f906fbc62822fe4b79b65146e9589dba6bbfd4540c1bcb623137dcb8417c6ee36d4518621c3dac683eab02a57f0cb01a7720b
-EBUILD elasticsearch-6.3.2.ebuild 2603 BLAKE2B 329924c83731282a8054c4c5965f30fa6c2748b4558044fa7b1407ef406dbc02a02735274ec942c20830396e2eec9e614b7406028623e03bab570e42bba522ca SHA512 9435e7af52a42bbe8626330dce0c2b80a827d697a8fae96edceba3a9665472775e71e23cee099b931bf17dc65eddce2fbee68e36823d1796bc7187169153db55
-EBUILD elasticsearch-6.4.3.ebuild 2579 BLAKE2B c397625f021c0dfccede2c57e24cd0584def56204ec33ea7fecd36e901fce6a8cd9d449b03dd19cc3c7ec66be5e700f25454e0cc2e18e5dd924791349b66f7cf SHA512 b89368ddc71306ab1345257ee899e2b0be87276587e5157d714616ca7548175ec7be80fc646ded6ac86635fae785def9b63401a642b805470b7abf54e0038d8e
-EBUILD elasticsearch-6.5.4.ebuild 2579 BLAKE2B 1bb66e455f8c832d2ba9d51800f2c5a859367205a440c758ac07770f671afe84518a10adda1d8ebe05cbdabad1a1cf340873236821c2b54fb29a718680b8f7ba SHA512 12871743b8e8104d55baaf301b679b130add0534fa8b40b90b458116d5a1b524d327180ea458af7114022e57e6ef810e7c63b64bd66d57b34bf0c038810f2fb5
+DIST elasticsearch-5.6.15.tar.gz 33887584 BLAKE2B f0e36842bacb73a552400a8874b0eea6e01ee9b09cd4094edae227f3cab0558ef422b3616786ea5cf169a3b6d684fc784df85aaf1a5397e2fb9eeed16b657740 SHA512 7509dc7a9be63c758448c35ec2d87923b4a3a596c7ff2f92863021a9e3604ec9171ac5180014edb70b600dc3029f681212e9be703818c04b6d3938c289eea4a4
+DIST elasticsearch-6.6.1.tar.gz 114126547 BLAKE2B b335b224af0c241cbdf83f81feec103274d9cdd9ee7f9c3c5a788cbfc4d7a24b3a345aa14853e378796f733c151f7f21b5b081b2071b56f40f0f068ef6b07939 SHA512 3f8619ae6a10a34c57d8bc0c2ba3851b79a494ea05a3d02119a6e12d2c6cb6a651e73b43adfd674b7fb16664b709b643d4be9ba0785dbcc6d7a7cc41da7b669f
+DIST elasticsearch-oss-6.6.1.tar.gz 34492424 BLAKE2B 9a63aeb86ec3bebbe685804b262316726cb93b42693f9ba8937cac65c7ec186f0bb470893568234a0b7cc8b58f0c91d2af94eb16c3d016e7533231eba32fdbb0 SHA512 0e536ff760673dd740f790f1b0c01d984bf989a4a9ad3c4fe998de4f824330ce0d5ea18f04421a8648af719aabd25a4393f90182079186e48cef539b5621914c
+EBUILD elasticsearch-5.6.15.ebuild 1686 BLAKE2B e5a66c3eb054f849bbfbc90abcdd8fdb8b5ba8ea69ddbcc8f2d9964ad70864cdd094c29480728c8d5b830184289fcb2a8c9efcefcfb6c026d7a5dfdd2f211497 SHA512 4e6f1a2478e0cfe515add2c63f6f906fbc62822fe4b79b65146e9589dba6bbfd4540c1bcb623137dcb8417c6ee36d4518621c3dac683eab02a57f0cb01a7720b
+EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.14.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.15.ebuild
index f5399ac194fb..f5399ac194fb 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.14.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.15.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-6.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-6.3.2.ebuild
deleted file mode 100644
index e022c71854fc..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.3.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.4.3.ebuild b/app-misc/elasticsearch/elasticsearch-6.4.3.ebuild
deleted file mode 100644
index 52da0c6d6359..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.4.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild b/app-misc/elasticsearch/elasticsearch-6.6.1.ebuild
index 1db488852a45..80521b9e40fd 100644
--- a/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.6.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=7
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index c16294dff19f..290dc7f13e8a 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,4 +1,9 @@
+AUX fdutils-5.5-superformat-snprintf.patch 655 BLAKE2B 635b89f3a3f20a6e255e56ed7e2cd306365a7b7bfa5047cb20d551919daffe4b956d53bc3896814d9aae84ab9586a98017c9e70df3101b5efd1f02d88173e1b7 SHA512 42d6fb5beed1548815c67921d74dcdef05e76c45cbfde08ba4265de29a58f26af22b1ea7bdd5b1b71a34f0268c7cdb9063652565c7856cd6503dd0425d56171a
+AUX fdutils-5.5.20060227-r1-parallel.patch 607 BLAKE2B 2fc63e7a08071afbe90c891785fb3bedcc93bb7b47077eee1af6ca19a449df3ea4c9b48885f0a6d58d6a47d0397b35c21ca7ba1aa93f5fe42e9b0b9d81b220f5 SHA512 c3ef752ae6580816e3a451cbd1d56f169d71608c723d5a7ce77cd80db5021b7ea2c85c78dddc4219f9cf59b5995248c222bb39f746b72f7244ab0c998f3cf732
+DIST fdutils-5.5-20060227_20081027.diff.gz 6748 BLAKE2B a6d9bf332a777c6c09c85ea85adfaf02422ed2e459d3cb5248c5f6c122e11d39c1a426288d8b611f61ee5ed33ceb5695644f6fbf5421e7a0b1b9937c6a3c26f3 SHA512 979ad8116a5e0c82584a534095e60689d3920d16f0685a184619012d4146f89d6dce063d896668242bf10a6372579ad16ee3e2093e386ff430f265a23458750d
 DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 BLAKE2B 4d0fbd1c9c4f115a9df3f7092e062173f6a8956df8d465bb0186f712f51f6ef9e4fc67c4c642cdf7ae7e9daa775d6657c4306f5837307a51daa0abcc12639b0e SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149
+DIST fdutils_5.5-20060227-8.debian.tar.xz 48480 BLAKE2B 16de5a3b9f634c3eafbe9048d84c6ff29933e5b5ad878de79e6b03aac49ec44334e7e8e090ad0518bc83e8adb91dd19612850f0de7e28bc9d9c10663fd9a5252 SHA512 a55823c2a4defe1ebad5a92c96a85766520a744b75f49e9f99eb14ec2c0ec44f91a72437d070942a4603f7e337ed60c380f61635b4aba57dbb5ddc8d771d8b89
 DIST fdutils_5.5-20060227.orig.tar.gz 222915 BLAKE2B d76a4b30ab60ea081e333817af11fe3815e8e19149c643afbcb931dc670fa3893cb96bb6be2136dea10fea06894a02e7fd1ecc4500ca6dd786054bbdaea19262 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd
+EBUILD fdutils-5.5.20060227-r1.ebuild 1727 BLAKE2B d3d56facbd81c613526ab722d59fc9a11e5c4f17f6bdc3b49e7c6cb0b0a2d873e469abd02fc95fea5a0db6212771c742af2b5189f32ad5c878d8e225140d991b SHA512 6ac168d7f5b0ce3fec16c8f9027f4f9eaeb11e0d47f997c6215fd6c33ac62d56c0a24df7fddd160c09cb91b0e3dc035b2dafd4b3b62e71a33fd1b2c33dbe4833
 EBUILD fdutils-5.5.20060227.ebuild 1344 BLAKE2B 3e80aef85d10e768ba7a18aabc9e25e746adf1eb4ff7b4c9b7a340e3158159901bdf7c071abdb817afba9c805708bdd8ed3c2b97a668793929fa534ce65b69ce SHA512 52042b4a2d05e325a64cd85703c777af4c154d6e79e59ac04fb138f1798ccaa60dfc9f5312390a382214d41ef59dcd933bf40b8c369952747ecea8a4791d95e9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
new file mode 100644
index 000000000000..d234389a9e19
--- /dev/null
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${PN}_5.5-20060227
+
+DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
+HOMEPAGE="https://fdutils.linux.lu"
+SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/f/${PN}/${MY_P}-8.debian.tar.xz
+	https://dev.gentoo.org/~robbat2/distfiles/fdutils-5.5-20060227_20081027.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND=">=sys-fs/mtools-4"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	virtual/os-headers
+	doc? ( virtual/texi2dvi )"
+
+S=${WORKDIR}/${PN}-5.5-20060227
+
+src_prepare() {
+	local d="${WORKDIR}"/debian/patches
+	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
+	sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721
+	# The build sets up config.h and uses some symbols, but forgots to
+	# actually include it in most places.
+	sed -i '1i#include "../config.h"' src/*.c || die #580060
+	epatch "${FILESDIR}"/fdutils-5.5.20060227-r1-parallel.patch || die # 315577
+	epatch "${DISTDIR}"/fdutils-5.5-20060227_20081027.diff.gz || die # upstream did make a patch-based release after 20060227!
+	epatch "${FILESDIR}"/fdutils-5.5-superformat-snprintf.patch || die # but it had a bug that strict GCC catches
+}
+
+src_configure() {
+	econf --enable-fdmount-floppy-only
+}
+
+src_compile() {
+	emake $(use doc || echo compile)
+}
+
+src_install() {
+	dodir /etc
+	use doc && dodir /usr/share/info
+
+	emake DESTDIR="${D}" install
+
+	# The copy in sys-apps/man-pages is more recent
+	rm -f "${ED}"/usr/share/man/man4/fd.4 || die
+
+	# Rename to match binary
+	mv "${ED}"/usr/share/man/man1/{makefloppies,MAKEFLOPPIES}.1 || die
+}
diff --git a/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
new file mode 100644
index 000000000000..49753478e5e6
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5-superformat-snprintf.patch
@@ -0,0 +1,16 @@
+Fix of snprintf bug in upstream's 20081027 diff.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*.orig' --exclude '*~' fdutils-5.5-20060227.orig/src/superformat.c fdutils-5.5-20060227/src/superformat.c
+--- fdutils-5.5-20060227.orig/src/superformat.c	2019-03-17 14:46:44.051851597 -0700
++++ fdutils-5.5-20060227/src/superformat.c	2019-03-17 14:48:34.550873108 -0700
+@@ -1140,7 +1140,7 @@
+ 		if (verbosity >= 5)
+ 			printf("calling mformat\n");
+ 		if (use_2m)
+-			snprintf(twom_buffer, 5, "-2 %2d", fd0.dsect);
++			snprintf(twom_buffer, 6, "-2 %2d", fd0.dsect);
+ 		else
+ 			twom_buffer[0]='\0';
+ 		snprintf(command_buffer, 79,
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-r1-parallel.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-r1-parallel.patch
new file mode 100644
index 000000000000..52c0a1357a59
--- /dev/null
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-r1-parallel.patch
@@ -0,0 +1,18 @@
+The Makefile implicit archive format ('Archives' in make.info)  from, e.g.
+'libfdutils.a($(LIBFILES))' does not support parallel operations. Convert to
+parallel-safe structure.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- fdutils-5.5-20060227.orig/src/Makefile.in	2019-03-17 13:25:43.891918479 -0700
++++ fdutils-5.5-20060227/src/Makefile.in	2019-03-17 13:30:05.067424657 -0700
+@@ -67,7 +67,7 @@
+ lex.%.c: %.lex
+ 	lex -P$* $<
+
+-libfdutils.a: libfdutils.a($(LIBFILES))
+-	ranlib libfdutils.a
++libfdutils.a: $(LIBFILES)
++	ar rcs $@ $^
+ 
+ floppycontrol.o getfdprm setfdprm: /usr/include/linux/fd.h
diff --git a/app-misc/fdutils/metadata.xml b/app-misc/fdutils/metadata.xml
index 6f49eba8f496..4073267daf2a 100644
--- a/app-misc/fdutils/metadata.xml
+++ b/app-misc/fdutils/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/gcstar/Manifest b/app-misc/gcstar/Manifest
index 8fe7d1c2cd83..a1798e4ef37d 100644
--- a/app-misc/gcstar/Manifest
+++ b/app-misc/gcstar/Manifest
@@ -4,4 +4,4 @@ DIST gcstar-1.7.0.tar.gz 4506937 BLAKE2B dfc6f53921ecad73676fb9943f87dfb3c465347
 DIST gcstar-1.7.1.tar.gz 4514370 BLAKE2B 001768d7e2b4d01c97b5a34d078979ce909def1e516166aa305dd03e343bd0188bb54c7adfeb84578f063e860fa78f8faf426f64938eba0688cf5c86feebee4a SHA512 2a37717c6e9bd83758bef99e810ef3321f5558bd5714aa2a332522262182daade9e623f51a256594f74094da3e680ba35d9650d0bc0451226bf41e98fdd57802
 EBUILD gcstar-1.7.0.ebuild 2983 BLAKE2B 5dea9b2b2e74043d0c015bd975cf2b84cc928862f871c8c0833dfa92ef7db4f13d99de145987aead78281a1936199b3efe7059756a90cb72c1b2ff85c130a69f SHA512 dda33ea7ecd94915c9777448fffca7768f53e12e85af730a1b1e9af343a7596d6319a06b6ba9f58a38cefa0db8d972cbae43f17a0fdb52e238480bf03c523b4c
 EBUILD gcstar-1.7.1.ebuild 2172 BLAKE2B d6b0641fcaa802947c08096c8a4eac18ba7615a7d0a30fdabb048be8dddbb4140355bc4bd5ddef33eb3054b2d08eb08fd86fe0a2a804a4724c3c844ad9ac280f SHA512 99e26e221e53648586be1dacde738076d1a3d434d57d7f83f1183201d504dd3582b8e079595a5ce095368bafa4d1a362a2659d66bc53bdcbf1a09ce28baaec8d
-MISC metadata.xml 967 BLAKE2B 94301ae3ebb8b7f8339f09c9e0d490a4c46e9a35eadb3eb2cd209ed292a6fc546faa41995bee4cbacfbd76445fdeffa78075377ecab0b2625e45b2fd283abc65 SHA512 0a7c5e4cd287e6c7d9f6bcbb3e406a19511410e3ea7498ff11fe00df89739bff959b0a1af38410f9a226fe850005bf0b604b3c2c0690adf5ba75fcfcd86183a0
+MISC metadata.xml 878 BLAKE2B 08bd6224a9066bcd47292389f3718d5378934bcf6b76c2d969f0703003ca50b725429dd3c336b4cb9021bd3dd0534d7ec7a5c1b6030f8338b952ae8c187c20b8 SHA512 b086dcfa2d846aab85f413600ba9f8db1bce21d6ff2463d7fd2f4328c10a5343013b049bf5143c0591f52ff111415ddd2863b09d634fa3cf124b384dad4f4dc2
diff --git a/app-misc/gcstar/metadata.xml b/app-misc/gcstar/metadata.xml
index 282c4fff288e..8e5a7ab35cdd 100644
--- a/app-misc/gcstar/metadata.xml
+++ b/app-misc/gcstar/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		GCstar is an application for managing your collections. It supports many
 		types of collections, including movies, books, games, comics, stamps,
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
index 968ae47c1299..8ac5116c215d 100644
--- a/app-misc/glcdprocdriver/Manifest
+++ b/app-misc/glcdprocdriver/Manifest
@@ -1,3 +1,5 @@
+DIST GLCDprocDriver-0.1.2.tar.gz 21438 BLAKE2B a480d241ad1f7b88ef63a0d2934d59325a9d5739497313c8bcc3f720a071d5bf2804986715e4392fc4713fc3641ae23e5f54cb81cdf1d45db9397d985555260a SHA512 b39dc9d68225bde63a053f124260cec9a081da1d2df6d245be109c8017d60e0e495f056fbc7ee077633d3ac68aaf7cdbaf606e1726f383aa583775a75eea5433
 DIST glcdprocdriver-0.0.6.tar.bz2 17209 BLAKE2B 631918337227c43eac163d7353182852500c08db0d1d0f3d4145d9b57895a66eb8c47a16715c1c0e4c3ab044a0de5ed80c282fd57850cbb33636cf775b721a4f SHA512 c489b6e6d6a72306867adb94ed6a6cf6354c834a27fd2ab2ac733707954b18bf93dc56a868e167fcb183602c03ac648bb941699760817e414ab8e8592edb8b7e
 EBUILD glcdprocdriver-0.0.6.ebuild 745 BLAKE2B 770037eff2b660262de1969140ca7ed5f5ca6bf6f0c2ec4682a7d211839347e07c626939f05c7103d58ea9b821297ece5b2ffad90f5651c19ad7ac5833c239be SHA512 3a7a28e045eafddbfc97b935454a557ead15aed88f1b6d2f9eed50f1fc1655c28a59b9bc810257a3de5eb32086e823e5821278c60672ab80b3a6caa263c81a65
-MISC metadata.xml 483 BLAKE2B 7fdac74c2af257088f9fc1d35d975c8532474bd61a52ae00d278dbb3db52388cebee18be4b1fceb5546bd6a30f14a254f5a3ebdbf329d8eb36e35b612643eaa1 SHA512 a72df04665d70953ea5a89a13e141bd78ac9817b4129c966b59c01d55f3afb15dfb44f49f9ce394c781ac94f034ed110e489f471dd93eb06af66d489a643a485
+EBUILD glcdprocdriver-0.1.2.ebuild 790 BLAKE2B 7b216deaa16a3f6ba54892428a84bf7cc24318ea24ef6a779b08c638dd66687c39699292cb9e79e2caa5ccd4e5e745ed04a09b5cb87e38403d1200fb8ca0d836 SHA512 df19ba42e5f4a9d467e06063084d10446e10c27d33935c5b72346722f0cf31daf6d45b9fe56d3998042e7e5004a48110340f604bed4cf6ab077af4deeb930abb
+MISC metadata.xml 1089 BLAKE2B c8d3e6cecf76a95e23b73b2411e68c0ad7174ce1dd497c50df74a7747bf6cc38267870522ba8eba50021f04c46365193516619f9b36aa6bab6b5fe6adc739241 SHA512 7d628191af503365b442deeb69fda18b451d34e87c903addec0cbdfc86c767522f11bfbd56ffa602c15cceb6355ab5844fba3390e5388cf333f5a458273efa4e
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
new file mode 100644
index 000000000000..6b396bfbad4a
--- /dev/null
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="GLCDprocDriver"
+MY_P="${MY_PN}-${PV}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A glue between the graphlcd-base library from the GraphLCD project"
+HOMEPAGE="https://lucianm.github.io/GLCDprocDriver
+	https://github.com/lucianm/GLCDprocDriver"
+SRC_URI="https://github.com/lucianm/${MY_PN}/archive/0.1.2.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=app-misc/graphlcd-base-1.0.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${ED%/}/usr" INCDIR="${ED%/}/usr/share/include" LIBDIR="${ED%/}/usr/$(get_libdir)" install
+
+	einstalldocs
+}
diff --git a/app-misc/glcdprocdriver/metadata.xml b/app-misc/glcdprocdriver/metadata.xml
index 9dde3d16415a..85a394977caf 100644
--- a/app-misc/glcdprocdriver/metadata.xml
+++ b/app-misc/glcdprocdriver/metadata.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		GLCDprocDriver is the glue between the app-misc/graphlcd-base
-		library, which is written in C++, and app-misc/lcdproc's
-		meta-driver glcdlib, which extends supported displays in LCDproc
-		by those supported through graphlcd-base (just in text mode, of
-		course).
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		GLCDprocDriver is the glue between the graphlcd-base library from the GraphLCD project,
+		which is written in C++, and LCDproc's meta-driver "glcdlib", which extends supported
+		displays in LCDproc by those supported through graphlcd-base (but just in text mode, of course).
+		It is implemented in C++, but provides the necessary wrapper C calls for use by glcdlib.
+		It is NOT intended to provide general C wrapping for the whole graphlcd-base, library,
+		as it really only implements the actual meta-driver for LCDproc.
 	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/lucianm/GLCDprocDriver/issues</bugs-to>
+		<remote-id type="github">lucianm/GLCDprocDriver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 4352e7a9f525..c42ce4f3f85d 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,5 +1,7 @@
 AUX graphlcd-base-0.1.5-nostrip.patch 3062 BLAKE2B ebcb8bf96457871e9cea6a5f8bff6e4458ff8c5f1868216645b1b5fca062904adbd3865784cf3fa260a7653e757f8e9cc534a411ed3b92cbe9f4e76ef7fccf84 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0
 AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45ee4f739d44eef28ec861040ca90b105cc8fa05ca1602d984c8ec9e08bcc8007825a3f87110f18371d530d65828b1a0d163fa9a98c2832a SHA512 7665e290b4e5e46fd62186ac1ab97b8245af8d96fa73e274e07c1660dc65c51c9b8048e4e5c0e316aa8c01233e758ef84c9202cf9142b1e92b9f172559081776
 DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
+DIST graphlcd-base-1.0.1.tar.bz2 522727 BLAKE2B 2353ddf095fc5642705682130f3336a1610d058561ca0a3ee9f1644d8a4fecfc6b45865c06732d7ba75b874b7efd6b033c64345aa359f28a9c5a1d48ae8dc0d4 SHA512 bc0ee958475e7156d90ec818542324a4220873ad5a65a2677f75ace86db8905e4a8e8dda3076628a660f90dd90a94cdd2f76eadd8fdf35615f17729041aed40b
 EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9
-MISC metadata.xml 464 BLAKE2B 2f69a92ffc1ac13154404024dade395001526ee2a787526034fa68857b01d41cf278ac4b13814e8f116ba16fa7f9e576d6dc09be8dafd8e4804199dc6194d3ca SHA512 a1c66dfad0b364ba3f03d42701c22f7e67c81fcbd03e8e5228f5072aa78d05ad0b09554173131456d789771cd53d3f77898c46ed853216407ace1786870fbcf9
+EBUILD graphlcd-base-1.0.1.ebuild 2165 BLAKE2B c332d4cb8da15b3d9e13b09546d343c3ba177874a124a221622340de5ef911a68e0fb80b4fe7e2ab7a378f76ab902f4f570718e119bcb3a88be2a8bdc3015639 SHA512 4f907a00cfa37e38cb6653b831361aa326abef143936c4ac9e0612c2d564ee6cda90e702d44cbb040f3423c66c263895269e8047c1c27c188d6b0938a16f75ae
+MISC metadata.xml 1077 BLAKE2B e0356b1628b9485ac746483a17cd3f8b026001676c605751f0a14b476a6f0ec37937cda4c8f6d7f4a627f7a23a68d5f5002714af5cbdfca8fa6c8ccfa43aae74 SHA512 f087452936369496699927c86029277c90cdb95504c637b118042c90726ac54b2518eab963c16b6a3deffa11ee7dcbcd2900f72af0d8a39dc0f261a4e5121fd4
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.1.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.1.ebuild
new file mode 100644
index 000000000000..1273e920f094
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic udev
+
+DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
+SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
+
+RDEPEND="
+	freetype? ( media-libs/freetype:2= )
+	fontconfig? ( media-libs/fontconfig:1.0= )
+	g15? ( app-misc/g15daemon )
+	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 )
+	imagemagick? ( media-gfx/imagemagick:0/6.9.10.28 )
+	lcd_devices_ax206dpf? ( virtual/libusb:0 )
+	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "HISTORY" "README" "TODO" "docs/." )
+
+src_prepare() {
+	default
+
+	# Change '/usr/local/' to '/usr'
+	# Change '/usr/lib' to '/usr/$(get_libdir)'
+	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
+
+	# Fix pkg-config names for GraphicsMagick/ImageMagick
+	sed -e 's/GraphicsMagick++/GraphicsMagick/g' -e 's/ImageMagick++/ImageMagick/g' -i glcdgraphics/Makefile || die
+
+	tc-export CC CXX
+}
+
+src_configure() {
+	# Build optional drivers
+	if use lcd_devices_ax206dpf; then
+		sed -e "78s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_picolcd_256x64; then
+		sed -e "81s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_vnc; then
+		sed -e "72s:1:0:" -i Make.config || die
+	fi
+
+	# Build optional features
+	if ! use freetype; then
+		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if ! use fontconfig; then
+		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if use graphicsmagick; then
+		sed -e "69s:#::" -i Make.config || die
+	fi
+	if use imagemagick; then
+		sed -e "68s:#::" -i Make.config || die
+	fi
+}
+
+src_install() {
+	default
+
+	udev_dorules 99-graphlcd-base.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index dd4d7485b6a3..f095e3e18617 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>vdr@gentoo.org</email>
-  <name>gentoo-vdr-project</name>
-</maintainer>
-<longdescription lang="en">
-  This package provides Graphical LCD Driver.
-</longdescription>
-<use>
-  <flag name="g15">Add support for <pkg>app-misc/g15daemon</pkg> driver
-    (e.g. Logitech G15 Keybord)</flag>
-</use>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>gentoo-vdr-project</name>
+	</maintainer>
+	<longdescription>
+		Contains the lowlevel lcd drivers for GraphLCD, which are also used by GLCDprocDriver.
+	</longdescription>
+	<use>
+		<flag name="fontconfig">Add support for <pkg>media-libs/fontconfig</pkg> font names.</flag>
+		<flag name="freetype">Add support for <pkg>media-libs/freetype</pkg>.</flag>
+		<flag name="g15">Add support for <pkg>app-misc/g15daemon</pkg>, used by the Logitech G15 keyboard.</flag>
+		<flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg>.</flag>
+		<flag name="imagemagick">Add support for <pkg>media-gfx/imagemagick</pkg>.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index d24b33707f97..6683872a652f 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,11 +1,4 @@
-AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b83638f4e72379f8756e62376c61ef3375c9ede50deb52619ead78a39d49280f9a654e0d8877158b6ef4b8117556 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c
-AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c
-DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
-DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
-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 2637 BLAKE2B 60303008a3c8ca884082d4cbd2c7d9db88faa6ad88cc8e6369ba8152d4dca3c46b234b0f16f4519ad1fe2c1b5cba644715ff6fa604ca5f8ff8707dbfb68e7579 SHA512 d134607cb038fcf80e7cbbacdef7bf81364a2a9deab35ba6323d10d9d487571e418f165d214108ecb648e048a519c0f4c6e6ac58caab4b3192d78a337bde5cfb
+EBUILD mc-4.8.22.ebuild 2636 BLAKE2B 635a57b5283e933974203bb812a58486468002c32eee42fc3db781b39d39375d21070e65eafc54ab240bb8f351869615b317d58dbd300094b735ddb990385a0f SHA512 29924f83e1d5ca88b01ec5c27755cb53ffbf950a573b7a34ae14989d02f56a581e7772a1c406bdb551ee689598e51c49e652438b1ae2239e9ecea95472320350
 EBUILD mc-9999.ebuild 2893 BLAKE2B 64978ade6c20ddf9babc40628bfd6ab1232e82ae2e2f508825d06c49f13a45d90dee7836849cd59fdc22b09bdb6d07f503af1bae46bdec1151b658a56fced071 SHA512 f8f59a611a500853882dd2baa0249d65a99c8ccdd042b756f9543219090485a152533acc412a08d25c4dc0ecde04b249664427a1ae5a0334eae9a8627dd1b29b
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch
deleted file mode 100644
index 761c103df654..000000000000
--- a/app-misc/mc/files/mc-4.8.13-tinfo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/527118
---- a/m4.include/mc-with-screen-ncurses.m4
-+++ b/m4.include/mc-with-screen-ncurses.m4
-@@ -101,6 +101,9 @@
-         LIBS=
-         AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"], 
-                        [AC_MSG_ERROR([Cannot find ncurses library])])
-+        AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
-+                       [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-+
- 
-         screen_type=ncurses
-         screen_msg="Ncurses library"
-@@ -111,10 +114,15 @@
-         AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
-                        [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
- 
-+        AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
-+                       [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-+
-         if test x"$ncursesw_found" = "x"; then
-             LIBS=
-             AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], 
-                            [AC_MSG_ERROR([Cannot find ncurses library])])
-+            AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
-+                           [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-         fi
- 
-         dnl Check the header
-@@ -166,6 +174,9 @@
-     LIBS=
-     AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
- 		   [AC_MSG_ERROR([Cannot find ncursesw library])])
-+    AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
-+           [AC_MSG_ERROR([Cannot find a library providing stdscr])])
-+
- 
-     dnl Check the header
-     ncurses_h_found=
diff --git a/app-misc/mc/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
deleted file mode 100644
index 06d6f46ff325..000000000000
--- a/app-misc/mc/files/mc-4.8.19-selected-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 2 Dec 2017 14:39:50 +0300
-Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
-
-The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/util.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/util.c b/lib/util.c
-index 0326f65e8..c23d91fba 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
-     p += strlen (p) - 1;
-     d = x + sizeof (x) - 1;
-     *d-- = '\0';
--    while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
-+    /* @size format is "size unit", i.e. "[digits][space][letters]".
-+       Copy all charactes after digits. */
-+    while (p >= y && !g_ascii_isdigit (*p))
-         *d-- = *p--;
-     for (count = 0; p >= y; count++)
-     {
--- 
-2.15.1
-
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
deleted file mode 100644
index 9b71011a40e1..000000000000
--- a/app-misc/mc/mc-4.8.20-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-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"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0= )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
-	"${FILESDIR}"/${PN}-4.8.19-selected-size.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
deleted file mode 100644
index 4a9db190f7b8..000000000000
--- a/app-misc/mc/mc-4.8.20-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-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"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
-	"${FILESDIR}"/${PN}-4.8.19-selected-size.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_prepare() {
-	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		$(use_enable mclib)
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.21.ebuild b/app-misc/mc/mc-4.8.21.ebuild
deleted file mode 100644
index e45e8f54e1b3..000000000000
--- a/app-misc/mc/mc-4.8.21.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-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"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		$(use_enable mclib)
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index 6e9bb632c7a3..f8cbc5a2c392 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/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 84be6c1284e9..73f2ff03e55d 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -13,6 +13,6 @@ EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f
 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.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.5.6.ebuild b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index 30791550cf93..2a915dd90e43 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
index eea7d2269a4d..76defde69621 100644
--- a/app-misc/pip3line/Manifest
+++ b/app-misc/pip3line/Manifest
@@ -1,6 +1,6 @@
-DIST pip3line-3.5.4.tar.gz 732872 BLAKE2B e544a2e1af958f3b1ef2e523d8489c807976523109ef8cc73f2c43b543ba9bd0b48d49009637d386e69f7768db6e2bd5a8f098d30dbd199a0b3d6bdaf782c103 SHA512 4a5421e4bf197d8ba2802c3007cfdd4d75a8c356f5bd8774d7f50bb3301e6beb52cc06f7d3486e85c3eaa16d192643afeb00b95e4d174ce16665b509e522ee6a
 DIST pip3line-3.5.5.tar.gz 733385 BLAKE2B e9577fb02d778b689d1c3f5849f714b7d27a5ad49a7a68e412a19cb8251e7ca1d76d0a046bfe10db2257593ccba4f1aa5fff0f34c317975f75ef347f50172088 SHA512 95cbc567f1a7f2bcbc07fe7d560829d9538c126a2748b762fcf505bad47926376abea9d8eaba8670f4c3826b988ea1ea1338faf625a6cdf8db17f457af4edbbb
-EBUILD pip3line-3.5.4.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
+DIST pip3line-3.6.0.tar.gz 736294 BLAKE2B 75bc3bcd3ad547a31a1fc97f525a8575136ba1bcb48e5e9d7292732c04d2a62cd03710a4e6d76a652d5259e5081cf8cc8c2dfc3265ecf1f3ea5cbc6870c02ab6 SHA512 4263d18749533f1137dc3546a6a5b5856f9c5dc09355c866c7e6a8fc59787c84ee979f648f563c465aab314ff9155bba6e34e7d4641438d96bdb786c93dfaec8
 EBUILD pip3line-3.5.5.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
+EBUILD pip3line-3.6.0.ebuild 2122 BLAKE2B 7a7b9e9a0aefc55ee7e01ae70255d8735854b118546378ff15825d8a668df858524a40fbfd4e2f527f668225da0ac006854e690b206b07932563c7722a968883 SHA512 211d45be4dbb056148652892775bb0514daac907bb69b25eff4bf6d78b2a52035cd4ad16a3eab99ece80e167534f5bf317644be1993a85fca4bc8538e2a24ef1
 EBUILD pip3line-9999.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
 MISC metadata.xml 617 BLAKE2B bf8ccd6ecd2783621a6e1c91c216afdf58ae3f4957541fe830fc3a39478331535b50097ae30f51d4ce305cf013cd613b45e3fca41d93b00f0e9a468c3f7b6346 SHA512 49298f62bc28cf669a9308741352fb510a1e7c5ba3749bfe6a9cb284e0ae35be27f672c404c194719440d68c2667f7ac58bb134335c5c95937c1b2e1d5f9e94e
diff --git a/app-misc/pip3line/pip3line-3.5.4.ebuild b/app-misc/pip3line/pip3line-3.6.0.ebuild
index 9789c01998c4..26d9bd9f18b9 100644
--- a/app-misc/pip3line/pip3line-3.5.4.ebuild
+++ b/app-misc/pip3line/pip3line-3.6.0.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
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index d27e275545b4..b106cc1ea80a 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -1,38 +1,83 @@
+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
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST cc-1.0.17.crate 42064 BLAKE2B 1b21666998f1a4746b069f0ac034b35203b52cb1bf712b5cd9bd2414b83121b0b8a6770b97b518843f7b65bd1546fcf448643a56bfc3e5b91a839afaf8f9c15e SHA512 565f93c7b1803e484f3602f9942c8d6f30e117c299dbc603cd187dd15f136d737cf84fb6138b405ec4d6e381f1ba2f3c0acb845fcb39b92f6e24c8f59a098c5a
+DIST cc-1.0.31.crate 42956 BLAKE2B 87e79061397a0e12ad4f3a32ab0b4bba764260c7de11eea055163538c749e8da32b95ad5efcb69ab72d210e0e7aed68c79f9ece33352b4cdacc5c1ec6d11f3cb SHA512 d6efba4c53fc8f11fdd685efb2759dbbbe53e65ae7878a61805b110c5a6028debb89a3e6d740bf7fd71055613de4fe92daaa98f34f86473c5a410ce3f17052df
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
+DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST clap-2.28.0.crate 186934 BLAKE2B 6885cb7a74077b1c72feac97471c08a456f5e826e42b95bb1768027fca127696a457cbb8069e624196e1c77e55608b8ec6b157bfa3e8a661dc0c9b67af903c9c SHA512 737bfa82008082d75ef5f36c5aa505af8e11ff08b7ec824a69f37dcafe1d7ea8e4909a94cf5de218f9bde4cd304e8ec57441b195d936b7db43e8b5881fda0d01
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+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 either-1.5.1.crate 11532 BLAKE2B 3cb46de61309efeedb614c20a83bdcf2c4de024fa1ca4e6e1cec6384445596cfbf2c9d7a9712faf554a373eaa462835b455d7b2a908a99e99ae1c738680778a8 SHA512 268d218b10ed7cabbf1a116afa22ebe47791303aa012a61676d04376961156983374490d3d939e5d68b2ccf3a9c56f41eb9c9651cf81ea1294ef275dc898733e
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
+DIST fuzzy-matcher-0.2.1.crate 8135 BLAKE2B 9fa6417a90190905b0c563d2f629a77f4a711c4c87eb2600b2411c00f11b125b2fad346be02ef30fbf21c0e6d0ae068f89baf5b300ba61bf705c4a4256909687 SHA512 c177eacbbfb45bcf6f607e0d421da18eaf4c25738a26fd553574901be2e9f5b9fd877f4886b0f6d68050dbd7a04d37f73420648fa3e122f2a18e26794865b63d
 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
 DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
+DIST libc-0.2.50.crate 392277 BLAKE2B 75a8fd5babba55fe59e3ecb49941c313dccc780f8f2d0c521e14e3bb63494090e919111b908b928c4048c0458095da5a48ebce90171831931a972c20b3de758c SHA512 36a51f7925a1a4e670ed8783f63d7f2ab85d1382d0be29ab4fbf0d66b24e7d68d88bb9e320e9dff35a1e275c07afe672dd164d12cc2af8ee1bb57ef6d2aa4a30
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
+DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
+DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
+DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
+DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 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 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
+DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead
 DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
+DIST regex-syntax-0.5.6.crate 233912 BLAKE2B 828c35471d8a91be9fbcad00e036c40ff0e2c38d008c5d916cb096f0a6856f124a64a203d547fb5ef45cc296565221e5f96343754413cf6bf2fd1463c7e02f1d SHA512 4ee43272d0d6e5cc0b554816e20e2d93b0ee774fd71643d5edae06627b295d374769ecdc3c1233a688d306d1cb86a83b6850ffe4022baa3db78beeea1190b455
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 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 skim-0.6.1.tar.gz 80538 BLAKE2B bff6e24e0c2b8461cf61f7f1e48f96ba0a353e39de0f4ead0ae40748286d666955f35cf3e088fc4253b9bde97784321a9636c0cee20fe4039782c57acaed8b66 SHA512 7fba58012cdce94f8d55afbde1ca8a4adcf07a2e4bf86da58b54cdc31fe700824ac7a16e1ea9558bd5f74ed21f8fda25a50237c68c4ca8ded9e9935570386ad1
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+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
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
 DIST thread_local-0.3.4.crate 11760 BLAKE2B 7d1c7bc70d6f35a04074ae6d25d14b07f4f48742a8090a1465d2b6cfc9a80e50a737cc75d65f4bd1de226c341d10d630092fee3be74daaada88f567767217403 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 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 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 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
+DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
 DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 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
+EBUILD skim-0.6.1.ebuild 1719 BLAKE2B 21d717b7f668b831d6083f8c4d3a54a080af950cd1adc766755b988942d9d38495099c70b1c627dc176e41f0b606b80630b1fb0e3ac58b3b3211f0ef52c3a399 SHA512 962b02989aec4a4c30e4dd13701bb18639dbff162b5b9018fec982620bcb3ba02267205e9c0831a332b9d07da9cf3dc42d9902f67ca8a47c3a5c8559a0a37080
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.6.1.ebuild b/app-misc/skim/skim-0.6.1.ebuild
new file mode 100644
index 000000000000..19d664eb91c5
--- /dev/null
+++ b/app-misc/skim/skim-0.6.1.ebuild
@@ -0,0 +1,94 @@
+# 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
+either-1.5.1
+env_logger-0.4.3
+fuzzy-matcher-0.2.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
+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
+term-0.5.1
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+time-0.1.42
+tuikit-0.2.1
+ucd-util-0.1.3
+unicode-width-0.1.5
+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"
+
+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}
+}
diff --git a/app-misc/tmux-xpanes/Manifest b/app-misc/tmux-xpanes/Manifest
index d166e68744dd..04083946b14e 100644
--- a/app-misc/tmux-xpanes/Manifest
+++ b/app-misc/tmux-xpanes/Manifest
@@ -1,5 +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
+DIST tmux-xpanes-4.1.0.tar.gz 61942 BLAKE2B 66467bfce249648eb88235eec64730d0fcab6fa7c3a77b207c4ad4fbb5a2a2998dbcbeecf848af15fae35ba080c950d2a82e154d1944cca7ca87f407a1a64d35 SHA512 3a25b694a9d559958e87f0deac3674e74cd8acde8392045fb8cf5262a0634938f7e61cf638066ea8836c475aeffd2e8aed3cee9b354ec2e88f05eb19d5f6dde3
+EBUILD tmux-xpanes-3.1.1.ebuild 691 BLAKE2B b8c175b1dd8fb6679c3d3f408d79c0011a00bf0e4fdc3cde75cb95e08a984eb94fd65260af4137537e2f9b2a3da6ae64d5d85928e547526752e3664e38fc58a1 SHA512 f2cadcf49e4fc4b44cee75bb3a3202469fcfa65022085310d880da0ad23061f66a09e00a6b61c912dff2af81faaf1798f690ee807d35df00ead88e9c7f651251
+EBUILD tmux-xpanes-4.1.0.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
index 75d8c2d638d8..389f67028568 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-3.1.1.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild b/app-misc/tmux-xpanes/tmux-xpanes-4.1.0.ebuild
index dda36039900c..75d8c2d638d8 100644
--- a/app-misc/tmux-xpanes/tmux-xpanes-3.0.0.ebuild
+++ b/app-misc/tmux-xpanes/tmux-xpanes-4.1.0.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
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /app-misc
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)