gentoo resync : 24.12.2018

98 files changed, 1532 insertions, 714 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b6d2d6ac644c..897d47c78abe 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index 5312a51bc7e1..93283a3d176b 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -2,4 +2,4 @@ DIST abduco-0.5.tar.gz 15790 BLAKE2B 6541c758aa5b2ece2f4eae744e9d9da7f8b4cf0d1e3
 DIST abduco-0.6.tar.gz 15829 BLAKE2B fd6c1670e0a4cf95bfaa00734b981c23877b79ffc14dadae8c84fb198cb4f585cdacf874e127190b6f8c8b784cdfa403a8be0f4cae8bc442d43723967f4525d7 SHA512 3b70a5cc10f0a2743dcbdf6eebdcfcee0e4f4ff8c6ce0bf0aa9f55c3fa85ab43aa659997735e063eab36aba69f91be7bb5519f3f632bff1b9098f5179165c1f2
 EBUILD abduco-0.5.ebuild 850 BLAKE2B bc7ef19288730e9e4c867d8df3d95f8eee6c2d7efea37347c1ea33a24f2b952d9f53c15b03c978e00c56d3d8b2d78ccada1f72202f648436e6b7084fda6c9b48 SHA512 9635efe7b043c02b3fbeee37ae1b6f3c35cd95782d4dcd7d00e0550d95b49f283419eda86f94f58849b76b2b2ca082efaeb3bd1483901d74fb94f4931ae313a2
 EBUILD abduco-0.6.ebuild 840 BLAKE2B 5dff2465e0a29ddbfe5aa217b773cf84c26601c8eab4bfb4467a7af4df9a52a74ac38af89aacd8d8b005581db75c3773ceb5b0256db2488b8f949cc5eeaaf97f SHA512 ca7b46ee13e03afa73a60f8b301b91720fef4e6aefa457cbb4e42ad3ca897f8e6a587e133f974fac6b729c9a40f0673ab2ed6e788cf677d7970edc273217f336
-MISC metadata.xml 808 BLAKE2B e82f42857bd2b16bc5d9e1990c47ef5aeec447b4e15308300fc81b8591c310a5f6b5aa7007d55cf28af7d463449b6642a7ace512c49ff20f05156f95a60ed9d3 SHA512 683ee33b44b4b6ff3c7d265a4a66b81285b1b65c94ab3264fdb502c3bb5108ae81e39b8c560675b77037ff1b8bbe46cfa714b53847bde86b1f7f590df9788e46
+MISC metadata.xml 708 BLAKE2B 4ae481813c0b910f9cc97a236dfccde94c3a8a5017b3168b96d45f719d6cdce5598005de5a5d045eeafc5efeec279399ab9254340fe2531c77b163e20c2cbc50 SHA512 93df341ab2c4b830e7c5d5beb0baa72b846c236c63ae893290032579be309a5a3ea033f14168886fa9356951cd54a68e0645705d9fddde2229dfc2cf80734767
diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
index b5007ff63a3f..ae7d6197d816 100644
--- a/app-misc/abduco/metadata.xml
+++ b/app-misc/abduco/metadata.xml
@@ -5,10 +5,6 @@
 	<email>hendrik@consetetur.de</email>
 	<name>Hendrik v. Raven (lorem_ipsum)</name>
 </maintainer>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 877156348148..2b2f8aa97a1a 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
 DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9
-EBUILD bijiben-3.24.2.ebuild 746 BLAKE2B 7412677816ed6c312d161368aaad02a409b0305ae7bb18146f490cb76026bbfd09c65a77e8fa7725afa85e938ac7289856e608905df8bf4d5e21f68233a6fc34 SHA512 d46b0891c5fa2c9268f8f667be70bb9a95b7fa7df75b090837d7cf1f156df09977ba1879b139f1a913324da3bac70f84328c5d8a21c415e5c16323ddc5f4142d
-EBUILD bijiben-3.26.1.ebuild 695 BLAKE2B 04654cb51f822a9bae0542fbe5c868557e11765ab7a551a81731a52d208238f70c740353b0343beb86f51e46cfbde6fbf1f0f835d863f74310c15292ec4e435b SHA512 4aad745279633e09caa3fe35c16940b98d3053c1a741b4197d31b52717dd0d170fc484085e857131944c41f2f2aa3a6e68d45bf3840c47f084c666da62cd5ee5
+EBUILD bijiben-3.26.1.ebuild 687 BLAKE2B fcf3074dbbd8d75d92d6c58ffdf3aaab8607a4d6b97ebff1b66aa64070c6e25dcc143848714003dc38af6ec8a96e3b0de451e0d7cc6eaeb2fe544c495d5b06ff SHA512 1d3e258e55e47849833a356992e9923c700c8e71c6ba6dbb14b74067003b093409c038e508294846b33e7cf33f3349c2a15d1bf85f33052c3ddcee77f8ccdbd8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.24.2.ebuild b/app-misc/bijiben/bijiben-3.24.2.ebuild
deleted file mode 100644
index d256e6bbbd16..000000000000
--- a/app-misc/bijiben/bijiben-3.24.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# XXX: raise glib dependency when Gnome 3.26 enters tree
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.11.4:3
-	>=gnome-extra/evolution-data-server-3.13.90:=
-	>=net-libs/webkit-gtk-2.10.0:4
-	net-libs/gnome-online-accounts:=
-	dev-libs/libxml2
-	>=app-misc/tracker-1:=
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/app-misc/bijiben/bijiben-3.26.1.ebuild b/app-misc/bijiben/bijiben-3.26.1.ebuild
index c73d26287367..f5a86b813fd3 100644
--- a/app-misc/bijiben/bijiben-3.26.1.ebuild
+++ b/app-misc/bijiben/bijiben-3.26.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
@@ -19,14 +19,14 @@ RDEPEND="
 	>=net-libs/webkit-gtk-2.10.0:4
 	net-libs/gnome-online-accounts:=
 	dev-libs/libxml2:2
-	>=app-misc/tracker-1:=
+	app-misc/tracker:0/100
 	sys-apps/util-linux
 "
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
 	dev-libs/appstream-glib
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
diff --git a/app-misc/cbrpager/Manifest b/app-misc/cbrpager/Manifest
index eda972769123..fd2252789437 100644
--- a/app-misc/cbrpager/Manifest
+++ b/app-misc/cbrpager/Manifest
@@ -1,3 +1,3 @@
 DIST cbrpager-0.9.22.tar.gz 146216 BLAKE2B 3396328ea7e017e0cf13722cc8545ce75ccf2cbc0446d1fcebefa02527dc32e3403ed29e456507495ebc3bcd94ce6a42b9b9f574b581952d94bee1efbc2a1ef9 SHA512 dc4bcf14528e6708a3ff0fc3b7e3163dfb9d6063f1cf40545b4f804915afedd9db4cd461834de7ee92fcd4b2f302b7f2ed0d9ae022e220dd8e6c95ccabea34d5
 EBUILD cbrpager-0.9.22.ebuild 580 BLAKE2B 61f96297dd8ff69b70398e19bf3821ead3b66769a68690bea7cf7ba1fb738b926e604f0e6de9acb0fbee10d83179af1cff7adb93031c6874fdf21e634252b045 SHA512 3c62931298b02360c2fc69d0603c45ad27acb99a82ad48b20d523ad895e4ce2d4a71e88c45abd42a7b5b8c6f88dcf8e4a2673314e7f4bf21db934a84a0baa519
-MISC metadata.xml 321 BLAKE2B d02f200968d8ae7336e01364267000063fdbf1865e5e2a0130f396bae5f7c5be91a84acbe5e3b307c87b77d98229e16c42aa2a70c7356f5ca12bb8c4b7cba836 SHA512 78b81a6c1d3bc153ce6b9e5f3a7169daf841de3705a956721cba492f952f0baa2e5db340d87f0ea18e9d2f2a2a5fcccaac2ff72f095ccc90b48bf3a23857d5e4
+MISC metadata.xml 245 BLAKE2B 8cfa30b68f8de5dc22358be1f317c37cec9b3adaf5b6d833e8ba4b8471db7b2e37d3eccb1936f143bd4cc75719c08c8688ab6e7db79df97e36e27a055f92bdc2 SHA512 f28b0e7430d6e6aa7a27742bb4a3a237a6a7e5c9e2671fd6e2c454ca32e0dc70b94aef9165839a7fe2bb388ff5fe71fcb25d20ed29f881bf4acdaeee07ac78c5
diff --git a/app-misc/cbrpager/metadata.xml b/app-misc/cbrpager/metadata.xml
index bcf8ff6b0728..ab75470f3ea1 100644
--- a/app-misc/cbrpager/metadata.xml
+++ b/app-misc/cbrpager/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">cbrpager</remote-id>
 	</upstream>
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index d45e2465c849..0db4a2e41f94 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,7 +1,5 @@
-DIST dateutils-0.4.1.tar.xz 611460 BLAKE2B f6dc70388e1cd269e5b666dfb23d8eace3dd98408538e102e220344e71670084fb6591dd213d625b33a57adde929f7ee5aa064950742b38c29fa4bec1cd3b9f3 SHA512 c13461de6dad483b0014692a2319a7bf9ed1677415b8ee168131b397086f75725eb8b4e833d8b4a22f4aa726d6aca74be2597c2e07ef75a036cfea9bf67ccf1b
-DIST dateutils-0.4.2.tar.xz 620196 BLAKE2B b2aa265db45c92e68ed2fa51d824eb2c5bef2cf1d663fcb1033cde4e8a818ac8c024554dd42c030aa0e3bbba1c07717c3040b9573291edb3bc740e92113f9406 SHA512 0b6e98bd9402dc3629122c3d68ab54df547ce779806661cc01df3625ab7cedb429d943ef46e151653283c1ac6c557f4bf14b3b5adaafbcac1d0a86c6d12895fd
 DIST dateutils-0.4.3.tar.xz 631216 BLAKE2B 1c9184e589eb01ff1da8be941afa5abb8095ef4b61a22d14e5c06f4faad175e2e9d8cf7077655f170033a125b7594d554e6996bbd0dd6f6508c16076d069e285 SHA512 0210ad1f47aec77b8b87a520da9155430b52068e53733ef7bb26dfa10e8651f2190171537d4317adf888733e9377f961d5ed070efacd8ca18139225fa8c185ca
-EBUILD dateutils-0.4.1.ebuild 613 BLAKE2B 75543251329b62a4a2f021e47783080810df7f9ca7f1eb69afdbd94e750d209e3c073d608ec2064e83a03e0640c308af041c654ef029e5465931761d99a7309a SHA512 d1b489a9ae82c30cf2f5160d86dffee4e1b180361d50e440f2f59d392d82056e65fe9d1c04906c65836de1293a026bee5c1cc8674454d92d7ba00e609b3e361a
-EBUILD dateutils-0.4.2.ebuild 609 BLAKE2B 630d6f77d66e11c654f494a9b97bbeefd1f249810c005a75242935da52199bd60d8e5d2f617093ade7b25878487b251b21caa84e247a510730be3efc0f8e4a46 SHA512 a6d34dcf92bd0de32e8fd6debdcd8ebd6bfb368ffdf9f0285e1be385ce154e774b31c2ff72fdb22492fb567d13aab2d286b220be250752395b72cf8a57d112ea
+DIST dateutils-0.4.5.tar.xz 635908 BLAKE2B 2766522f81ff94ec70772ff91d1a0a08f4b07c2d6f99fce85a0c3363c74e0caede4bedfcafbd610bf2a401ac2f027f9b2fcebe198e4bf94c7ffcb2048da4947e SHA512 91d7b83dc70a0f46920c6bb5b1f456d6b3b5a8f9511218ac74888006501adef5c938f95e424ca8537e2a69bf632b2a08ef4a2536d89367089afb3da55cde70c7
 EBUILD dateutils-0.4.3.ebuild 609 BLAKE2B 215b9b8c08e6b83a62e3b0761aee06ee756c256dddd088ad7f0d5b2888f45b1b0608a00e7bee47d03b124a8d437b73d5e66f509ddeb0b8b582262f651f7ac294 SHA512 55cadfe615fc99640bdc59d80ef8639ffb514d5069663cc04f0917a52059bfbe99fffc1785481b870e5ce5011b8f6aeba50a6dd135dced3942545f4a7b980b26
+EBUILD dateutils-0.4.5.ebuild 606 BLAKE2B bb06031da4c748eb71ae2943f4c0c76d821e396b3af2b40bb373dfb90a543b525abc0d17e53da8ab7c3eb27539890787e77e7a4afaca7fb2a396a2e405447a87 SHA512 533f32f0ee2ccf160ecbfc8f55d80f73f0572d15b0318a7e435d723e971a7fb6a175f69e68633cc7b91e4505ea1ad9826b195543bfa442ec55695c09b20107b5
 MISC metadata.xml 333 BLAKE2B e586b40344d636a0bd265fdd2482726c1a17f6311fa7cf1ceadc8022ec3acebcda968c189bb41fc5ac9249251e8c0048dd2e8b33be47e4676465475df7018e07 SHA512 a1308350546b711fdddab0b90f257fcffa15f74855d9a08172b0a38d4d859b748150e17270b1534dc97d949143be5f39d8822dfcfc030b2a60f601c3551b9172
diff --git a/app-misc/dateutils/dateutils-0.4.1.ebuild b/app-misc/dateutils/dateutils-0.4.1.ebuild
deleted file mode 100644
index f9a24de86d03..000000000000
--- a/app-misc/dateutils/dateutils-0.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="command line date and time utilities"
-HOMEPAGE="https://hroptatyr.github.com/dateutils/"
-SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/xz-utils
-	sys-libs/timezone-data"
-
-# bug 429810
-RDEPEND="!sys-fabric/dapl"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_test() {
-	# parallel tests failure
-	emake CFLAGS="${CFLAGS}" -j1 check
-}
diff --git a/app-misc/dateutils/dateutils-0.4.2.ebuild b/app-misc/dateutils/dateutils-0.4.5.ebuild
index 63d7c2a12439..f9b6dad45b3a 100644
--- a/app-misc/dateutils/dateutils-0.4.2.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="command line date and time utilities"
 HOMEPAGE="https://hroptatyr.github.com/dateutils/"
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index a52c708a1a7f..2a2624f7dcce 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -11,9 +11,12 @@ AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a735
 DIST elasticsearch-5.6.13.tar.gz 33894848 BLAKE2B d6b486154c4b4df155e443adee7d07200822f4a14f9cc50753e5b4621630c3b5de7b6b3d3ad7745b898f5a24c02aaddbec05aaf0f5d38fbda8acd78eed433939 SHA512 dbda463f0fba0b921ac65ca8743f53cb21410001cb6113aeaa2bfe3e22fbdac9f9010a3bdd2df5b8bc6c7cd59513d9fbac8b408d22d2b885ff5dadbb463b7981
 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.13.ebuild 1686 BLAKE2B 5275864107bfc5c8be3e0725eac78ec21021aff4716f494f8e793e2198223450ff5fa7eaeb63959641af4a4c9e30c3ba865e7871cec6ec903010a97b1cc3c107 SHA512 ef36e2a07bf258cacd735c87b765d72c678a47c2a968e89e9ed11ce2592aa42ec2509dc65fa39dd2a66ff4e681d724c05dc4f7ad93439753beee75aa0dccc744
 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
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild b/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild
new file mode 100644
index 000000000000..1db488852a45
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.5.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/freeplane/Manifest b/app-misc/freeplane/Manifest
index 4884e223a3de..32c526c92ca2 100644
--- a/app-misc/freeplane/Manifest
+++ b/app-misc/freeplane/Manifest
@@ -1,4 +1,4 @@
 DIST freeplane-1.5.18-gradle-cache.tar.xz 23290912 BLAKE2B 4f346d408a999a50a5f2ccb3170bb614d21c24347382524a716e6548be521953679fd0d582ddb5024de77a05de915d929998097711f2b1bc11e3cc5edb1f0de3 SHA512 db9fa368c829b7cffad0aa863823e75efe06be0c7b8480f3be3bfe53adac28a6f1d51a8b0bb91958eecafd1dd61d81c0ef15193ba4e20ebe87f55450b599aece
 DIST freeplane_src-1.5.18.tar.gz 13233435 BLAKE2B 07080abeda3fd2dea3aba4b093d759931a57eb55b010b7d4f69e1f007318c3c2dc08f676f8e990898a8f1ffe130574a02579987f4493562ec824ee3bba3aa162 SHA512 c7feaf957e1d67cb8e71e0b8aa1193c291b5cbc482f932397baeb8f296062378864e5004b59740d716b5c833b5404732ce17d7551ab0a3b663d3fda44327bccb
 EBUILD freeplane-1.5.18.ebuild 1346 BLAKE2B 8447a18a7a42f5989d28894f3d77522437a9384d3ab8da184e89242f841863cffa34e0b167ed1df63a41179feef9ecc517da0aa40f9e881180349c33ea679ffd SHA512 d2508c040c5cac008ae2be86b7bf9164a7711bdc837f748f3f9121cc190d577540414b8de9b586be65a88e0afd22944a0e0210f845866dfc3fb4bcd8feaac082
-MISC metadata.xml 624 BLAKE2B c4ff6c7d6685707393ad73269ee24c1358b9a4b2b8a1fed08f42daaffc07dffdbe7f4b3c8cda08d04689bd29b905640682d1c5f96c4d01ab9dcff1ee3791d6b1 SHA512 6f1492a2425291717a9f01e06e0480b3ee04fe566b0f5506f102fef49a34e3f2421a8471e6801f50f531e13d1781c68f0c45724fa9d8e52c98d0d33e3b04fb20
+MISC metadata.xml 548 BLAKE2B 37da994e9e39b96b2628c9625fa7434d9063db9a56056e26fbfc8a75ec5f3cbc7a265663f3f90c467e0eba1e010286190e8405f72a8e66e1daffb74026d5f887 SHA512 c6dc6a125f959154995e3c94f781e1a092a42f2809b18ae413297d7e272141d8338e4ba8c835567a044fc309bc7b24c10ac8bf4a902944965ba21fdfa381b3a5
diff --git a/app-misc/freeplane/metadata.xml b/app-misc/freeplane/metadata.xml
index 14c857935b2c..fb07d0fa750b 100644
--- a/app-misc/freeplane/metadata.xml
+++ b/app-misc/freeplane/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
 	</longdescription>
diff --git a/app-misc/fujiplay/Manifest b/app-misc/fujiplay/Manifest
deleted file mode 100644
index 4974c8675805..000000000000
--- a/app-misc/fujiplay/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fujiplay-1.33-unterminated-strings.patch 3146 BLAKE2B 4130f1a8619b7989e39ac415ee70e54a8148ebb1839dd482c1f475519e730cfabadb0fbff7978b7d18b0d53f002935e2a1383b1cfe0b368f782cf839d70da518 SHA512 9ce4ead7ee94f6b75dd4a0605ba56dd1adf0397d261ba96514c2588dd6335e187276bb63f21ed2b1ec02d8e72f1f4316c2b4b94edadb0deba18ed055874051aa
-DIST fujiplay-1.33.tar.gz 12588 BLAKE2B 4be2b4d44696f5d43942c19cde308874684c87762b2778026750c4db9ba249c2ec8b7986bca5c526c7199289b3094157c068067db38a015372fd6fbd5a1e285d SHA512 168ce95b6926da2438fb858b2537060877145b28638217214f72833fcc75b76dd7e5bba9ed0ca966cd2f7f1c31ca3302ee4662907bf743c393314d615d795149
-DIST fujiplay.tgz 12588 BLAKE2B 4be2b4d44696f5d43942c19cde308874684c87762b2778026750c4db9ba249c2ec8b7986bca5c526c7199289b3094157c068067db38a015372fd6fbd5a1e285d SHA512 168ce95b6926da2438fb858b2537060877145b28638217214f72833fcc75b76dd7e5bba9ed0ca966cd2f7f1c31ca3302ee4662907bf743c393314d615d795149
-EBUILD fujiplay-1.33-r1.ebuild 1031 BLAKE2B 0743516293107b5f5856fb2434e74df02b7cdc0328cc94be0710741abf13598ccee94ff2deab2f3b36a857a7cbb8afcf5b11e5ea56724e0f5c2ce2b51c543735 SHA512 d901567859ccec2cf343c3514ffe36fb3171f3c1d4b63b40e1e35df21cec189e3b8d1b076f4b1820bb7df4a8c210a2110f66bce755b859ac9c9ef6b5ed4ece70
-EBUILD fujiplay-1.33.ebuild 1086 BLAKE2B 719c97d033c92c5a9cccd77eefed0b6dd3fda0acc85a9887bd97e54f4fc9702dca037615776e092cd217800f563bff0c04f2a1e74a02d74c5248208d72d8ba66 SHA512 d5a6e81d91ee1b8b3b21ff0f237904d8485c2291fc664cf782ce42fd73979a2f8a8774829a3c30ec9a61d64ad898f4b1c70bdbcb2de875a0f0f88b9b1ca55ed2
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
deleted file mode 100644
index 1ae946336242..000000000000
--- a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/fujiplay.c	1999-02-23 10:30:31.000000000 +0100
-+++ b/fujiplay.c	2006-08-05 00:50:08.000000000 +0200
-@@ -759,40 +759,38 @@
- 	return 1;
- }
- 
--const char *Usage = "\
--Usage: fujiplay [OPTIONS] PICTURES...          (download)
--                          charge NUMBER        (recharge the flash)
--                          shoot                (take picture)
--                          preview              (preview to standard output)
--                          upload FILES...
--                          delete FILES...
--                          setid STRING         (set camera ID)
--                          setflash MODE        (0=Off, 1=On, 2=Strobe, 3=Auto)
--                          setdate gmt|local|YYYYMMDDHHMMSS
--Options:
--  -B NUMBER	Set baudrate (115200, 57600, 38400, 19200, 9600 or 0)
--  -D DEVICE	Select another device file (default is /dev/fujifilm)
--  -L		List command set
--  -7		DS-7 compatibility mode (experimental)
--  -d		Delete pictures after successful download
--  -f		Force (overwrite existing files)
--  -p		Assume picture numbers instead of frame numbers
--  -h		Display this help message
--  -v		Version information
--Pictures:
--  all		All pictures
--  last		Last picture
--  4		Only picture 4
--  2-10		Pictures between 2 and 10
--Files:
--  DSCxxxxx.JPG	Files to delete or to upload into the camera
--";
--
--const char *Copyright = "\
--Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $
--Written by Thierry Bousch <bousch@topo.math.u-psud.fr>
--Public domain. Absolutely no warranty.
--";
-+const char *Usage = "\n" \
-+"Usage: fujiplay [OPTIONS] PICTURES...          (download) \n" \
-+"                          charge NUMBER        (recharge the flash) \n" \
-+"                          shoot                (take picture) \n" \
-+"                          preview              (preview to standard output) \n" \
-+"                          upload FILES... \n" \
-+"                          delete FILES... \n" \
-+"                          setid STRING         (set camera ID) \n" \
-+"                          setflash MODE        (0=Off, 1=On, 2=Strobe, 3=Auto) \n" \
-+"                          setdate gmt|local|YYYYMMDDHHMMSS \n" \
-+"Options: \n" \
-+"  -B NUMBER	Set baudrate (115200, 57600, 38400, 19200, 9600 or 0) \n" \
-+"  -D DEVICE	Select another device file (default is /dev/fujifilm) \n" \
-+"  -L		List command set \n" \
-+"  -7		DS-7 compatibility mode (experimental) \n" \
-+"  -d		Delete pictures after successful download \n" \
-+"  -f		Force (overwrite existing files) \n" \
-+"  -p		Assume picture numbers instead of frame numbers \n" \
-+"  -h		Display this help message \n" \
-+"  -v		Version information \n" \
-+"Pictures: \n" \
-+"  all		All pictures \n" \
-+"  last		Last picture \n" \
-+"  4		Only picture 4 \n" \
-+"  2-10		Pictures between 2 and 10 \n" \
-+"Files: \n" \
-+"  DSCxxxxx.JPG	Files to delete or to upload into the camera \n";
-+
-+const char *Copyright = "\n" \
-+"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n" \
-+"Written by Thierry Bousch <bousch@topo.math.u-psud.fr>\n" \
-+"Public domain. Absolutely no warranty.\n";
- 
- static void sigint_handler (int sig)
- {
diff --git a/app-misc/fujiplay/fujiplay-1.33-r1.ebuild b/app-misc/fujiplay/fujiplay-1.33-r1.ebuild
deleted file mode 100644
index 796eccb8d312..000000000000
--- a/app-misc/fujiplay/fujiplay-1.33-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
-HOMEPAGE="https://www.math.u-psud.fr/~bousch/fujiplay.html"
-SRC_URI="https://www.math.u-psud.fr/~bousch/${PN}.tgz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/${P}-unterminated-strings.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin fujiplay yycc2ppm
-	dodoc README fujiplay.lsm mx700-commands.html
-	emake all clean
-}
-
-pkg_postinst() {
-	ln -s /dev/ttyS0 /dev/fujifilm || die
-	elog "A symbolic link /dev/ttyS0 -> /dev/fujifilm was created."
-	elog "You may want to create a serial group to allow non-root"
-	elog "members R/W access to the serial device."
-	elog
-}
-
-pkg_postrm() {
-	rm -f /dev/fujifilm || die
-	elog
-	elog "The symbolic link /dev/fujifilm was removed."
-	elog
-}
diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
deleted file mode 100644
index 17402bcb3856..000000000000
--- a/app-misc/fujiplay/fujiplay-1.33.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
-HOMEPAGE="http://topo.math.u-psud.fr/~bousch/fujiplay.html"
-SRC_URI="http://topo.math.u-psud.fr/~bousch/${PN}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-unterminated-strings.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin fujiplay yycc2ppm || die
-	dodoc README fujiplay.lsm mx700-commands.html
-	emake all clean
-}
-
-pkg_postinst() {
-	ln -s /dev/ttyS0 /dev/fujifilm
-	elog "A symbolic link /dev/ttyS0 -> /dev/fujifilm was created."
-	elog "You may want to create a serial group to allow non-root"
-	elog "members R/W access to the serial device."
-	echo
-}
-
-pkg_postrm() {
-	rm -f /dev/fujifilm
-	echo
-	elog "The symbolic link /dev/fujifilm was removed."
-	echo
-}
diff --git a/app-misc/fujiplay/metadata.xml b/app-misc/fujiplay/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-misc/fujiplay/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 9d46166b4bb9..c4045dd5020b 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -3,7 +3,9 @@ AUX geoclue-0.12.0_p20110307-use-flag.patch 2571 BLAKE2B 17c6d6009bc8bc089c2fa88
 AUX geoclue-0.12.99-gpsd.patch 2073 BLAKE2B 499774d91864ada9ef29a2154e17bed7e143f0e13fb30a6e9d8231f6f6e7fac9b35f99b042aa05aade1ad139dd9d393951b16dee10c3bb104aa325fa418cf24c SHA512 9a5280af319cea99567fbbaf8174f11de71f9dbbeb146c4ad42a19df1d84f7573c9cd72560b7185065e5b8507770f77fa3cc06b3e45e0a56fdf3d3e5b717f0bc
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
+DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
-EBUILD geoclue-2.4.8.ebuild 1577 BLAKE2B 2a1c4e4dbc825798a172a90cc1ed1ecea0b92b130bf03587a3b24564cb514df2289516420d9924def46322041849ef7fc1e6a28f7df3813cf88d7550d9b5f873 SHA512 3ac7765ba17df00d3864eb0c8fab5d21c43a9974d85e238789c461a7f267a2e65757d5469c59cb3f593aaacc6ab4907c92e60d63765e4b73237832d09d990658
+EBUILD geoclue-2.4.13.ebuild 1670 BLAKE2B 927f3a40e32f616621bc152ffc96d4226138e2e3c713978f73f0dc3d22b567fefec57d6a70dff61408d2c497dd8d71a5819caebbfdaeff18197b02cc6d904119 SHA512 9d6cb2985d67e0743ab603784e9154691ac9eefce5d1094213de1f36812ff3ac29946e6e9ee967b2b6dfbabcce3b78f0488ad079f98d5ed561a0eb14baf7a056
+EBUILD geoclue-2.4.8.ebuild 1595 BLAKE2B da073168dee9f469f3d4f89abfbf5b38a6a777115157956b13528c4af511a5fd10dd2e59a9af31ff65318d01fe2b398c510edd93a6acb2ded7961235733427db SHA512 5474ed354d535a1fb8f5a0558cccf8e8e063ba254d86ea44bcc4a00486aa10a4d741cf3eb9e906f500dbdb1b72ab3843c136454e269f63eab608e20fb6ffbb46
 MISC metadata.xml 1062 BLAKE2B 11f3d019f7c014387f5b3faece7dd7f165e106dd27132cf56bf59b35be2fe2ac0dd02751eb87e4e8bfa77fdecf076217eb76e6e5b37acb33c26d2f26cf1ca942 SHA512 3747063a944f72bed17f4948a0c8041746cf61fe85f2b4886cf6b8f88c01dd4cbab37a94447c3a900416bf1a374d88deb812f89789e74f4465654b26fe18899d
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
new file mode 100644
index 000000000000..93ff80b44085
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_EAUTORECONF="yes" # 2.4.13 isn't properly disted, as released concurrently with 2.5.x, which is meson
+
+inherit gnome2 systemd user
+
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+introspection modemmanager zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.14
+	>=net-libs/libsoup-2.42:2.4
+	sys-apps/dbus
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	modemmanager? ( >=net-misc/modemmanager-1.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
+	!<sci-geosciences/geocode-glib-3.10.0
+	x11-libs/libnotify
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# debug only affects CFLAGS
+	gnome2_src_configure \
+		--enable-backend \
+		--with-dbus-service-user=geoclue \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable introspection) \
+		$(use_enable modemmanager 3g-source) \
+		$(use_enable modemmanager cdma-source) \
+		$(use_enable modemmanager modem-gps-source) \
+		$(use_enable zeroconf nmea-source)
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+	gnome2_pkg_preinst
+}
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
index ba3294f255e4..8ebbf6f9f6f3 100644
--- a/app-misc/geoclue/geoclue-2.4.8.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,6 +27,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/gdbus-codegen
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index e7efdbb20dc9..7d337a070581 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,5 @@
 DIST gnote-3.24.1.tar.xz 3310012 BLAKE2B b6167dbb2461e574e4f21b2f227eb9a3c89708ddd15a561146faa044130e5c9ccc6d64b4923c30726160ee35d4ab5a0ae04b1593e74af2fa6566582af9bc1f18 SHA512 759fb2984312a3e3d5aed9b79f2309021b69df57b820d34814a5d3d9b5c9201abc6e50d83bf64f30974991d779b0b85e599435a24ee1326b867a2a4be8e0f37e
+DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
 EBUILD gnote-3.24.1.ebuild 1547 BLAKE2B 8a0e15ea352c054b0d777386d798334f921e5778c462822e932a5f21f0442b7bd71738f4ebc91ada4f6eb58c60af5d4876bc0265d0d283fcbe925cc4c8ce2bd7 SHA512 6144bccd5cd942f967729912371ff82622874cde18bfda99f905322a9fa16d3e52d0d973d17d4b2da5c92d93ada3eadd19f9f90db57bdddfa2b03cbeb12aff7d
+EBUILD gnote-3.30.0.ebuild 1608 BLAKE2B ae94df56146ca758d6bd06b52acde7d38b4a956ad8fbe90970ba1085471ddf0e587583336c09b20db7552fd9a19b19848d13e9d5203c9d7a4a8bfd1f7a0a78f2 SHA512 23fd26fcee15af1cbbce35b3dacafd0990a6e42d478c7b870e985511a301c5f312fbaab10b45b91a81e8362ac7885aafdbe990fa69da54b3d2b00bed234c5760
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.30.0.ebuild b/app-misc/gnote/gnote-3.30.0.ebuild
new file mode 100644
index 000000000000..c5ce78a1cb5c
--- /dev/null
+++ b/app-misc/gnote/gnote-3.30.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# Automagic:
+# glib-2.32 dep
+# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
+# glibmm: first version in tree providing Thread API fix
+COMMON_DEPEND="
+	>=app-crypt/libsecret-0.8
+	>=app-text/gtkspell-3.0:3
+	>=dev-cpp/glibmm-2.52.1-r1:2
+	>=dev-cpp/gtkmm-3.18:3.0
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=x11-libs/gtk+-3.20:3
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+DEPEND="${DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Do not alter CFLAGS
+	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
+
+	gnome2_src_prepare
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable debug)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 12fab431020d..f42c5a1ea82d 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,5 +1,9 @@
+AUX golly-3.2-mouse-1.patch 2506 BLAKE2B c406ac060601a4bed6351a0ed23ffafcc46bcd08a76da6487054afb5491c4d3a6fb514a252a7bc2161797e50d868d10a98e5fefb2ed9632a9682f747c1d3252d SHA512 e567198dbf7fba0b5edfd174b1566e180c2ad81129fc0336d381dfa7bbe2870816b98bb02d5ac61dc174aca12a1f03e79bd1f8023ccab4db4b3f73c29ccc9a6c
+AUX golly-3.2-mouse-2.patch 1553 BLAKE2B 34e8a85532ca7176fa4f587438662b760a72d97489d37c69150cd3b9467c7a4d06571754013a70aa95cfce56dc8e385608911b21c163b10c3304281164360b50 SHA512 34b96fd4d7f0aa004bad14a5eb872a55386b2765d7b29d497ca5ed8fe5f3404996b58a372a34ec8f988f6178d15ca1c45d15d94145238230408813261284c5f4
 DIST golly-2.7-src.tar.gz 3881882 BLAKE2B 1989ff56049b7a182cbca35e33ac287c279ebac69acc5d07ac5122e8ccffef978a2e063c0587813d177a6311c854c6d52c2e80a5919107f9c6b17947a5e5f1ab SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77
 DIST golly-2.8-src.tar.gz 4087191 BLAKE2B 4029b9bd30624cf2253dc5524c998f7e50648d39bc8dccf23b5c6b586989a641dde17b9fe35f16043d0f0d4a60da46729b31a9715b5d07950d610ea41a93a7a5 SHA512 bd86f685d180687814a44aa51edf4952a5af9024abb76d6b30faf1229edc86a1ba4e1f2c13f249f604d483fbde1a6db05150263450935b5bb073c155ad166a53
+DIST golly-3.2-src.tar.gz 5261483 BLAKE2B c9a1c09c71bafcb624eab91c7b86d671bd0cec23041d5ada91972c363242a4bc0c55d699f45e9b732dd00d4f030818a51f9c1e4ccafed298e230d912d4d22235 SHA512 bff5bbe75c0914bfcd416101894f8be1fd644c147fb90e0ad2cf87b4472c132c5d50be1829345fae59038e3d2e106ac417c5bc3cbc5c7d3a32a03c241b7a8eca
 EBUILD golly-2.7-r1.ebuild 1016 BLAKE2B f4d11a14b186a071c7c4e3d22fed0f86ba01b60cf05594e5fa5d36b92efbdb88791130cca30b5b53509357521cac6c8e38714e6ce7eb29892dacf23d948abcc0 SHA512 28c118e5bd8542699bd89517e301a169dcb0961920fe66958329bf4570c3e6a53446069850d24553ac6f9ab69b99445a51888281edcb34d83a54f79497428216
-EBUILD golly-2.8.ebuild 1128 BLAKE2B d5c9c5cb9b3d06720ba88a80026b04dd7a9ba46bff7aea77b394e99fa25d541aaf70ed3319ad1b83ca624b901ffe943f104407a0037d5385e63a6bfa45067e90 SHA512 fb2accd032fc55513a560f8a18fed679520128a38bf025e0d85616fe44e55f58e2d3d1bd993fbcccf5db99a98fd13ae33d1c6f60ed34ee95b19924ea4e6aa06d
-MISC metadata.xml 318 BLAKE2B 3521aab878976d7d846949477eb917c04e1c4cf04667b950e2b6e16ffa7dbae647a02a95759ed9069a763bcf6e059dc494f0e848574856177c2f71c5c8b32ce1 SHA512 38f971db2a96d7d2b20a3151b3000c01b0fbe4dac6ec537ff0fe662d50311afbaa42090edc5a91387ea83616d1b143ed104e9596d807b34799acceabd9c2c71f
+EBUILD golly-2.8-r1.ebuild 1132 BLAKE2B d7e03271c35d155f163fa54f2c0264cd4ad651248cd80f64b93ab832f2e647371134783ff77f543d80b8dabf3e05aab781777051e13ebe625370df3a5290efb3 SHA512 3f162769d8940a0eed7d227fca60675fc430ee285beae0c5f6dfb19c94414f4eec61f758b506c107ca79f45981bdbfdfc7ee51889c7e8859c0307f451ef4035f
+EBUILD golly-3.2.ebuild 1150 BLAKE2B 353b5ed9260c8b8b594cf3fa4804b62eb3207aafa90d71892b240ab658d9adc625cba8e5b9e80cc484d349d1d8644ef2da67075b530f5eeefa72f4fffee04fb4 SHA512 560377816c32ced370653be76cba7c18855803e348733e94476ca0ee367af62412ac4021d6a583b7576f93486171cbd6ef3c4b43076745210a071281dd185a72
+MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.2-mouse-1.patch b/app-misc/golly/files/golly-3.2-mouse-1.patch
new file mode 100644
index 000000000000..ab4fc703f507
--- /dev/null
+++ b/app-misc/golly/files/golly-3.2-mouse-1.patch
@@ -0,0 +1,63 @@
+From e22d1534d486a7b46612ca6f6cd693b8fa4635d2 Mon Sep 17 00:00:00 2001
+From: Chris Rowett <rowett@yahoo.com>
+Date: Tue, 10 Jul 2018 23:22:20 +0100
+Subject: [PATCH] bugfix: do not process other mouse buttons until current
+ button released
+
+---
+ gui-wx/wxview.cpp | 15 +++++++++++++++
+ gui-wx/wxview.h   |  2 ++
+ 2 files changed, 17 insertions(+)
+
+--- a/gui-wx/wxview.cpp
++++ b/gui-wx/wxview.cpp
+@@ -2801,6 +2801,13 @@ void PatternView::OnMouseDown(wxMouseEvent& event)
+     int button = event.GetButton();
+     int modifiers = GetMouseModifiers(event);
+     
++    // ignore if a mouse button is already down
++    if (mouseisdown) return;
++
++    // flag that a mouse button is down
++    mouseisdown = true;
++    whichbuttondown = button;
++
+     if (waitingforclick && button == wxMOUSE_BTN_LEFT) {
+         // save paste location
+         pastex = x;
+@@ -2870,6 +2877,13 @@ void PatternView::OnMouseDown(wxMouseEvent& event)
+ 
+ void PatternView::OnMouseUp(wxMouseEvent& event)
+ {
++    // if the button released was not the first held down then ignore
++    int button = event.GetButton();
++    if (button != whichbuttondown) return;
++
++    // same button released so process
++    mouseisdown = false;
++
+     if (drawingcells || selectingcells || movingview || clickedcontrol > NO_CONTROL) {
+         StopDraggingMouse();
+     } else if (mainptr->draw_pending) {
+@@ -3273,6 +3287,7 @@ PatternView::PatternView(wxWindow* parent, wxCoord x, wxCoord y, int wd, int ht,
+     selectingcells = false;    // not selecting cells
+     movingview = false;        // not moving view
+     waitingforclick = false;   // not waiting for user to click
++    mouseisdown = false;       // mouse button is not down
+     nopattupdate = false;      // enable pattern updates
+     showcontrols = false;      // not showing translucent controls
+     oldcursor = NULL;          // for toggling cursor via shift key
+--- a/gui-wx/wxview.h
++++ b/gui-wx/wxview.h
+@@ -102,6 +102,8 @@ public:
+     bool movingview;              // moving view due to dragging mouse?
+     bool nopattupdate;            // disable pattern updates?
+     bool showcontrols;            // draw translucent controls?
++    bool mouseisdown;             // mouse button held down?
++    int whichbuttondown;          // which mouse button is down
+     wxRect controlsrect;          // location of translucent controls
+     wxRect pasterect;             // area to be pasted
+     wxCursor* oldcursor;          // non-NULL if shift key has toggled cursor
+-- 
+2.19.2
+
diff --git a/app-misc/golly/files/golly-3.2-mouse-2.patch b/app-misc/golly/files/golly-3.2-mouse-2.patch
new file mode 100644
index 000000000000..b2655ba6212b
--- /dev/null
+++ b/app-misc/golly/files/golly-3.2-mouse-2.patch
@@ -0,0 +1,45 @@
+From 746f5f6f0c29867ac97516d00fdf58d3496a6687 Mon Sep 17 00:00:00 2001
+From: Chris Rowett <rowett@yahoo.com>
+Date: Wed, 11 Jul 2018 12:44:22 +0100
+Subject: [PATCH] bugfix: clear mousedown flag in mousecapturelost event
+ handler
+
+---
+ gui-wx/wxview.cpp | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+--- a/gui-wx/wxview.cpp
++++ b/gui-wx/wxview.cpp
+@@ -81,9 +81,7 @@ EVT_MIDDLE_DCLICK    (           PatternView::OnMouseDown)
+ EVT_LEFT_UP          (           PatternView::OnMouseUp)
+ EVT_RIGHT_UP         (           PatternView::OnMouseUp)
+ EVT_MIDDLE_UP        (           PatternView::OnMouseUp)
+-#if wxCHECK_VERSION(2, 8, 0)
+ EVT_MOUSE_CAPTURE_LOST (         PatternView::OnMouseCaptureLost)
+-#endif
+ EVT_MOTION           (           PatternView::OnMouseMotion)
+ EVT_ENTER_WINDOW     (           PatternView::OnMouseEnter)
+ EVT_LEAVE_WINDOW     (           PatternView::OnMouseExit)
+@@ -2901,18 +2899,15 @@ void PatternView::OnMouseUp(wxMouseEvent& event)
+ 
+ // -----------------------------------------------------------------------------
+ 
+-#if wxCHECK_VERSION(2, 8, 0)
+-
+ // mouse capture can be lost on Windows before mouse-up event
+ void PatternView::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
+ {
++    mouseisdown = false;
+     if (drawingcells || selectingcells || movingview || clickedcontrol > NO_CONTROL) {
+         StopDraggingMouse();
+     }
+ }
+ 
+-#endif
+-
+ // -----------------------------------------------------------------------------
+ 
+ void PatternView::OnMouseMotion(wxMouseEvent& event)
+-- 
+2.19.2
+
diff --git a/app-misc/golly/golly-2.8.ebuild b/app-misc/golly/golly-2.8-r1.ebuild
index 1c6a36ee52e7..0dda2847e7e9 100644
--- a/app-misc/golly/golly-2.8.ebuild
+++ b/app-misc/golly/golly-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="dev-lang/perl
 	virtual/opengl
 	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]"
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}"
 
diff --git a/app-misc/golly/golly-3.2.ebuild b/app-misc/golly/golly-3.2.ebuild
new file mode 100644
index 000000000000..6000a64174e4
--- /dev/null
+++ b/app-misc/golly/golly-3.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic python-single-r1 gnome2-utils wxwidgets
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mouse-1.patch
+	"${FILESDIR}"/${P}-mouse-2.patch
+)
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_configure() {
+	ECONF_SOURCE=gui-wx/configure econf \
+		--with-wxshared
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index f40f0dd4325f..5f6d283dd742 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">golly</remote-id>
diff --git a/app-misc/gtk-sunlight/Manifest b/app-misc/gtk-sunlight/Manifest
index e842d05d2299..a3761c0c967b 100644
--- a/app-misc/gtk-sunlight/Manifest
+++ b/app-misc/gtk-sunlight/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-sunlight_0.4.2.orig.tar.gz 562581 BLAKE2B 6fd80fd0324de2e7fbe5cf72eddecee128abe4d4d4cb13c30c224241f1fb99a8683bce43f2b60dc309ac9479f424bd31db5a5c2c659a36da0266b3fc58cd687c SHA512 6490172beeb4c3566a42de858e321cdf83be6852d5c290f75f41d22855d002e8609948164cb757e787a1123a4fe47b69272996ffc821c057b7c6ce8b0b180083
 EBUILD gtk-sunlight-0.4.2.ebuild 561 BLAKE2B c52c7f3c048717138b6c815d16be2a6329ace22a53d6a71468bf6847e5f15b64d0c9f93c44edfc1f7ae50ee18cabb810a98a37b8daf26660aeee5a08d9cff92f SHA512 22429b40240fcb211927e87408c5335a0731e5381c472d68ca3528113c3d121feae7c456b1419cf3479a99b407461df7eb30d6a67f2ad6eb423155b6bea116f9
-MISC metadata.xml 239 BLAKE2B d243069880f9225abf8b77145dd8c9edbc49f9cd3ce91b8995f16aec20c74534c9e8941a0886c01ee4a2cac5dea72653b8be1b08033252e9f81a76ca9b78bc32 SHA512 be29819db58c3ddb7212a488f9965de11cb5d84223ccae9458e968425296d3ef0f93f20edf7b4ab8a4dda6c166c4104c8b615c82feac5d87b3364a88de591a45
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/gtk-sunlight/metadata.xml b/app-misc/gtk-sunlight/metadata.xml
index d04de4894ede..6f49eba8f496 100644
--- a/app-misc/gtk-sunlight/metadata.xml
+++ b/app-misc/gtk-sunlight/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/hddled/Manifest b/app-misc/hddled/Manifest
index 68118230a70a..88d420b2032e 100644
--- a/app-misc/hddled/Manifest
+++ b/app-misc/hddled/Manifest
@@ -1,3 +1,3 @@
 DIST hddled-0.3.c.xz 3108 BLAKE2B eb7f2ab61d1969fe0f6ee3a8bebd7346b5cabcbb8a432a9c8c802289dc022efab09e2ca627915c9d2aacaeac8e6519524b9d77d34141850de7693778e825fba8 SHA512 9f535557aff78d3c9693a8d34810a768e8306de73841ba0d0a928a5d205a8a5faf632a9bf51db8763b5d8d2b3de73ee6f06af62f1a0025b0912c7c18133cdf19
 EBUILD hddled-0.3.ebuild 783 BLAKE2B c54c9cea89f996e1b7fc627b3583a985d85451ee485f5fd91ba97bbb3c7546c58f02824326499ce948f28a2c2f74941f5fe9448cdead973ba26ceda3af83018d SHA512 cce593ff9cb8517bd3c3ddec35a5bf195f256eb6965bce307c7843d49a2cc92a3a17581cdcf6184704f2092f84bd42bb1ffe662b55103ba6a7f4a41f15efa6fc
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/hddled/metadata.xml b/app-misc/hddled/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/app-misc/hddled/metadata.xml
+++ b/app-misc/hddled/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/hexcompare/Manifest b/app-misc/hexcompare/Manifest
index 6d2f17f351ef..f2b807a10077 100644
--- a/app-misc/hexcompare/Manifest
+++ b/app-misc/hexcompare/Manifest
@@ -1,4 +1,4 @@
 AUX hexcompare-1.0.4-Makefile.patch 445 BLAKE2B 68b34176c976109a2c9b7cc17b88b92f877f2f05784bc726907ae2c28b4923d8f0649fd3fefa987e04c0b996ac2da1ab4789f90162c4eed7b3db3b70add229df SHA512 8f66e5b080d41906ea9301c066a51f5869a7274e29a6a1391ea81d129dfc88682f035c1ab57319199d5e82020fac7e96e2666fec362a5605d562dc5826448a4b
 DIST hexcompare-1.0.4.tar.gz 9686 BLAKE2B 930004101504ec2bce1aaadac03a221e29e4668cf58591292510d3c66effbdd5f91fc405fc4d55d9116ec3ba260c91927371c8768e01ccf4169cb6d955642128 SHA512 847bf7e26f27aa0ff56e38b3fe95ad7940a0226e0c496963530fa405d8a3a50f8288a4c7f28d48d4cce05e52c1f69180917a7f10da0943cabf977f78b62eb5fe
 EBUILD hexcompare-1.0.4.ebuild 533 BLAKE2B d937143767bad3cefbf91c9533bf4411b6202b9372a335e230e2f99070597031fdeaa3051cb0ce460ae97e40bd2c2277e297bf6636e62bcbbc762b5c72deeb7d SHA512 3718883457b7dc577392c254d7d4345aee25c0a56e33051383247a40b01f0da8adccea3ce3802f20398f8362ad5154ab615c76a5456365f3f366ac57d628d181
-MISC metadata.xml 323 BLAKE2B 043e136d1f7ba694b012de967d34b7959235ec42f11149c294320b04845571561178755f523105b030c0fcdec143372fde63abbfe7093d8cdd53aabb790123a9 SHA512 ed9c5371824dbf3b0954b16809a85ef0ad9646c0c6342fefa778450f15e6bb092050e0384c3fc05d1a68b4f4430f2bddc5d9ce09ada00728172c1aa5674d0c25
+MISC metadata.xml 247 BLAKE2B 3362ea9ddb31607fa1426a03bc8be5d5a0b41d13ee83d637244cd31e1a92a894c9cd49b540d3e8a640947386b60ad100ad480bdd0222bbb89357c59bb2aad23d SHA512 1d627a295a24a74a48994cb68bf025f3a945fce6933ec14f9ca0bdf962839d40c31820e27fd70e8119dd75f6c02cb2303c558a9e3a818b96988670f4a2bc16dd
diff --git a/app-misc/hexcompare/metadata.xml b/app-misc/hexcompare/metadata.xml
index fc00942f6391..38b6347b943d 100644
--- a/app-misc/hexcompare/metadata.xml
+++ b/app-misc/hexcompare/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">hexcompare</remote-id>
 	</upstream>
diff --git a/app-misc/iguanaIR/Manifest b/app-misc/iguanaIR/Manifest
deleted file mode 100644
index 47e6449bc7b9..000000000000
--- a/app-misc/iguanaIR/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iguanaIR-1.0.1.tar.bz2 287572 BLAKE2B 6f1a0d3b6dc61199d85bc76892a7a241d8ef19c8bf9a0647074a5ad1433a1745f47f63e5c0dc8e2e543d088efd0d280f02269c0825cb60b46dc3e898273b5c2c SHA512 d70e792d6d51b99d9d82e4411bb16de24846d87b5066592734b614a866cdfb317f3aafbab6ef478552b57c4077776daa6db89b44201103ecaec8fd44df041e0e
-EBUILD iguanaIR-1.0.1-r1.ebuild 1006 BLAKE2B e4c91659ab12bc9461759aca221bae606be8b16a4c33c0a532075d394f139ca2bc6f048cead1aa5a0f540691aee8d4a67af146b57cd1ded6a7e127a237257e69 SHA512 1e327b784cd3117ad00dcd6b6250e5112db4dcdef3a463106c531c5bbb9575adce1d60f2aab42002c197ef436023b70cceab01fd05758aea5898e6c19231af45
-MISC metadata.xml 246 BLAKE2B 944087c83bbbbc622182d61966f7c750d9a195d5e66b4416ce44ee1c0df561f10abd2d2918c6ae35b76ce8a7275c5491f4344ce2093cc3b95e9146bb92fa750a SHA512 868df1fab803f62a132c9c8b53b4e74c3db4b664eb1499c2f484c5b993b1ba138656b3ef9745bc911a53e2628891bf8017e367999f4842f7b27cf34905650004
diff --git a/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild b/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
deleted file mode 100644
index 041069f38491..000000000000
--- a/app-misc/iguanaIR/iguanaIR-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 user
-
-DESCRIPTION="library for Irman control of Unix software"
-HOMEPAGE="http://iguanaworks.net/index.php"
-SRC_URI="http://iguanaworks.net/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-# sys-apps/lsb-release is used by the init script for detecting Gentoo
-RDEPEND="dev-libs/popt
-	sys-apps/lsb-release
-	virtual/libusb:0
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	enewgroup iguanair
-	enewuser iguanair -1 -1 -1 'iguanair,usb'
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# Working around bug in SWIG version checking
-	sed -i -e 's:1.3.31:2.0.0:g' configure || die
-}
-
-src_install() {
-	default
-	python_optimize
-
-	dodoc WHY notes.txt protocols.txt
-
-	rm -f docs/{Makefile,pullDocs} || die
-	dodoc -r docs
-}
diff --git a/app-misc/iguanaIR/metadata.xml b/app-misc/iguanaIR/metadata.xml
deleted file mode 100644
index 139e8d63a524..000000000000
--- a/app-misc/iguanaIR/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>hd_brummy@gentoo.org</email>
-<name>Joerg Bornkessel</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 2f514a275035..f3fe14642f1c 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,6 +1,11 @@
 AUX jq-1.5-dynamic-link.patch 292 BLAKE2B 65edf9902b3a97621cb5485931d6978625b89870e0728c92dec008abf0a978aa1ea496245294c0a8eed75498abec5a01b7fea8efa8185b7c54d4140e75af8abd SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee
 AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 BLAKE2B ae161ea9ce220f57ee5aeec1b9d202de8401dcb5e842ba8d105eb3a2bc2cbd0f387980d76bfe8a30a6304ea04a1d00fe8733e7dab46507602d16eac74387f3a6 SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718
 AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 BLAKE2B 821dc0ba57bdabf268efb3429417ee5e32d666dc33debea89aa7550c4bbad3c5938a6a0bf0cb4adfc2c0173b7bfeac3dcd16c52b19be6e92733ea8dfee89b4b5 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d
+AUX jq-1.6-never-bundle-oniguruma.patch 2574 BLAKE2B 0d23b17807c88940f3f586657d9e8247466bae172f135b8e22c7e888fc92363a7bbcced97934d643e5a0c45256c63fe70347fc48ea32b053cc456fa5e28e44ec SHA512 57924c5cf4e189c439a008f104a9e96ea8eefde2f950089baff4fe049cd52433693dba8b1aa4eaf63afc3256e169df4a3d167311662ace66416abb54c01215b2
+AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f929f639310bd1089bf4134bf1aed722701f23b108db62057b75328e2debf1b0313cdc7eef60b116173b7e5d SHA512 ce02eeba87606a1a95b301abdb42eaad2bcd6049ebac1514cd4316f0202439142c7c6d529f34770a663f10e34190ac22dde039c36c51a1e1d5300b1dc56bd555
+AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a30dc317cade0e0034b86dcf21296b7ed29c7e239204d9ab063d0418e3b8389ff7a39d688c3279c78fc4b22a126 SHA512 0c5b3f82cc6bb98413c7adf5a12e3cdeae7c611417853f3e9c5026e54d237c4f32ef47f6347b09d2cc63f0efa12b7790a588da98cf752d2d4cc0fa50978cab8b
 DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43e06391bb97ba3a163f07c79906b9cf94d4b53f20598dc8ccacaff9e54ff3c32387fef1b3d484c13e73 SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238
+DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
+EBUILD jq-1.6-r2.ebuild 1414 BLAKE2B bcf4071d05aa6cd18c916a7f94bfadbc71404200d0cbc6ed9bda81141b4649fca052b8873aa5b37243446697128b0152ca631277df96f7e0924f9ea280220970 SHA512 b00d5da0c9b53a4434aa9c8d375173fd0e36e70890def0fa522aec9efba3bdd2abe3632aad6707aabcb6fc8b10d95c581580a3354f92a4b9bb3afbaf9975369a
 MISC metadata.xml 423 BLAKE2B 1e5f03ac7d6b93814bdfe760d9b2d9b74447272b554f7e92c40918069c7787ee8c60dd68a86df38c67f27422f0f281c7ad7234305a45532b657be0397a5b81af SHA512 1787b1ce5d050aaa440996ceaf2367e39192af71e7d9a0d973e8dc8a87854f910aefd020c869867e3da5da33d27cc261047a1ded58b18052b21bf6737ef3081c
diff --git a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
new file mode 100644
index 000000000000..0b0e92600507
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
@@ -0,0 +1,80 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6344b4e..5f0c74d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d
+ lib_LTLIBRARIES = libjq.la
+ libjq_la_SOURCES = ${LIBJQ_SRC}
+ libjq_la_LIBADD = -lm
+-libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
++libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+ 
+ if WIN32
+ libjq_la_LIBADD += -lshlwapi
+@@ -137,15 +137,6 @@ jq.1: $(srcdir)/jq.1.prebuilt
+ endif
+ 
+ 
+-### Build oniguruma
+-
+-if BUILD_ONIGURUMA
+-libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
+-SUBDIRS = modules/oniguruma
+-endif
+-
+-AM_CFLAGS += $(onig_CFLAGS)
+-
+ ### Packaging
+ 
+ docs/site.yml: configure.ac
+diff --git a/configure.ac b/configure.ac
+index 280694c..0c5d86f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,45 +236,20 @@ AC_ARG_WITH([oniguruma],
+       [try this for a non-standard install prefix of the oniguruma library])], ,
+    [with_oniguruma=yes])
+ 
+-onig_CFLAGS=
+-onig_LDFLAGS=
+-build_oniguruma=no
+ AS_IF([test "x$with_oniguruma" != xno], [
+    save_CFLAGS="$CFLAGS"
+    save_LDFLAGS="$LDFLAGS"
+-   AS_IF([test "x$with_oniguruma" != xyes], [
+-      AS_IF([test "x$with_oniguruma" = xbuiltin], [
+-          build_oniguruma=yes
+-      ], [
+-          onig_CFLAGS="-I${with_oniguruma}/include"
+-          onig_LDFLAGS="-L${with_oniguruma}/lib"
+-      ])
+-   ])
+    AS_IF([test "x$build_oniguruma" = xno], [
+        # check for ONIGURUMA library, either in /usr or where requested
+-       CFLAGS="$CFLAGS $onig_CFLAGS"
+-       LDFLAGS="$LDFLAGS $onig_LDFLAGS"
+        AC_CHECK_HEADER("oniguruma.h",
+           AC_CHECK_LIB([onig],[onig_version]))
+        # handle check results
+        AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
+-          build_oniguruma=yes
+-          AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
++          AC_MSG_ERROR(oniguruma.h not found)
+        ])
+    ])
+-   AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [
+-       onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
+-       onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
+-       AC_CONFIG_SUBDIRS([modules/oniguruma])
+-       AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
+-   ])
+-   CFLAGS="$save_CFLAGS"
+-   LDFLAGS="$save_LDFLAGS"
+ ])
+-AC_SUBST(onig_CFLAGS)
+-AC_SUBST(onig_LDFLAGS)
+ 
+-AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
+ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ 
+ AC_CONFIG_MACRO_DIR([config/m4])
diff --git a/app-misc/jq/files/jq-1.6-runpath.patch b/app-misc/jq/files/jq-1.6-runpath.patch
new file mode 100644
index 000000000000..40a2ed02f3db
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-runpath.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 280694c..7227c9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ AC_CONFIG_MACRO_DIR([config/m4])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+-
++AC_ARG_ENABLE([rpathhack],
++	[AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
++	[
++AC_MSG_RESULT([patching libtool to fix rpath])
++sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
++sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
++	],
++	[])
diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch
new file mode 100644
index 000000000000..8eb7d456bc6b
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-segfault-fix.patch
@@ -0,0 +1,22 @@
+From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
+From: William Langford <wlangfor@gmail.com>
+Date: Tue, 20 Nov 2018 09:58:25 -0500
+Subject: [PATCH] Add missing jv_copy when printing with -ar
+
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index b154689e..61ae43f9 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) {
+   while (jv_is_valid(result = jq_next(jq))) {
+     if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
+       if (options & ASCII_OUTPUT) {
+-        jv_dumpf(result, stdout, JV_PRINT_ASCII);
++        jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
+       } else {
+         fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout);
+       }
diff --git a/app-misc/jq/jq-1.6-r2.ebuild b/app-misc/jq/jq-1.6-r2.ebuild
new file mode 100644
index 000000000000..9463846be754
--- /dev/null
+++ b/app-misc/jq/jq-1.6-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A lightweight and flexible command-line JSON processor"
+HOMEPAGE="https://stedolan.github.com/jq/"
+SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="MIT CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="oniguruma static-libs"
+
+DEPEND="
+	>=sys-devel/bison-3.0
+	sys-devel/flex
+	oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
+"
+RDEPEND="
+	!static-libs? (
+		oniguruma? ( dev-libs/oniguruma[static-libs?] )
+	)
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/jq-1.6-never-bundle-oniguruma.patch
+		"${FILESDIR}"/jq-1.6-runpath.patch
+		"${FILESDIR}"/jq-1.6-segfault-fix.patch
+	)
+	use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
+		configure.ac || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		# don't try to rebuild docs
+		--disable-docs
+		--disable-valgrind
+		--disable-maintainer-mode
+		--enable-rpathhack
+		$(use_enable static-libs static)
+		$(use_with oniguruma)
+	)
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md )
+	default
+
+	use static-libs || { find "${D}" -name '*.la' -delete || die; }
+}
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 9cc3934007f5..24467ad8a2fd 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,6 +1,8 @@
+DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce02388a61fa1c426cc16e97fe509110c2f129203882504dd4d7bbe6ddf95a01d7147abf78a0a9b6c898af89814ee SHA512 7618e34e35726670721dfd12e1434d5ffe4221ffad5d751ef26dc26edab4334c847582bbd4f50cfb93f37a07397ccc467e240adaf3dcf1d9446e0ca6faff7721
 DIST khal-0.9.7.tar.gz 173401 BLAKE2B a0ab87f8ff4546f589b7cc05586c1aa36cf80760234df00241d9eaaced3bcf37bb8b4bb282c39491f69c9ad6fea0f89af3836c29e23294356847bb88fce645b8 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180
 DIST khal-0.9.8.tar.gz 173717 BLAKE2B d17a355bd4eddaaf3cf838bac6e66f6a4a72170d6e166aa9fe00d44295031d336651bbb74e2ab73a6ae85275f02f8bf035b6798e280055dd6e38dd139f30c6c8 SHA512 4c47bd18e7458ca7a6adf0684872923b4e49e6bfe481269cf9f77dee29dd47dbacf0d557890080618b4d3f08766fc8fae32de7682167642f0705e5b3b6b5dc01
 DIST khal-0.9.9.tar.gz 171830 BLAKE2B 924df2bc8cfa8373ded88e9173e57a6017fd0c0d7ff507d79cd8ef8845d81e3962130d1def3a0070c6a68a00bf27a80d5b851bf79c23087f8513d1ae81222566 SHA512 cc38d8852e5bd47e266e23d48fbafa66aa1f84d67022780b7b0c8c8d4f54860be06a4d2675c49a48b4551fbdce1ec99762fd3b12a2ada69a0768d200697ef03e
+EBUILD khal-0.9.10.ebuild 1210 BLAKE2B e10348623dc668305e014bb891249614b2757244fc61c605e9b058dc37eb9a86967cf90b6fd63efb17153d18a9033aa540f5a86aa7d10f3e2059d00fb6f0fef0 SHA512 85bba0b8ae2c4251b32fb9e46c06a37b1867e62d7a3701ecfc8032ff53d72b3919417cbf3ee81fac857c0b1485b3b3ce2bb787c7d3c281c194835415f6f78af7
 EBUILD khal-0.9.7.ebuild 1207 BLAKE2B d7cfe30f0bc7bddab804832f705d4e71ad800886a98a9dc0fc2b6db98bbda40cd49a150cce0081d40ff69ad270eafd9ffe29e4c9f1a3858c92baa2e6187dbf21 SHA512 d7ca15a1a4003b4da7ae77e8917c5746b55c35c4286bdf82dbd8acf14ed0c468151466d5f279d4a4b5b066a48d9f6b48ec5f53bc7f109bf825184e9e53b62166
 EBUILD khal-0.9.8.ebuild 1206 BLAKE2B e27a03775b1c98238e145746743ccb8fe3c8d28633816dc6f8da37becc4b9933c21a354cc459c0276f65bf7369dd4e625954bdd65428f1726145d4aa1aea4b3c SHA512 0f73cd31b3d77d8e5b224ad310abff1ce32ea8fe05ee4a8302fffc601e98ef29debf89f9921cea5c2c0c97bdc066388ea558cfe32854f1b588cd02cd840b5fa3
 EBUILD khal-0.9.9-r1.ebuild 1223 BLAKE2B 6b1f1622bad85c13e3b4dfee66a212257f52b0a98d7c280d28e224bc32d84355f5488b34d1d523e5002dbb7068f255bed25a43e323d91a88c5c89a6dd1bd6f78 SHA512 ab12da121c47f73282a3e3ecc2cb1c051ffba1ec2dae2f1f3ced207495e87a2de04706bc3d94349719cf83d8d08b75b6e87627fc1d41da319134f9c333a44209
diff --git a/app-misc/khal/khal-0.9.10.ebuild b/app-misc/khal/khal-0.9.10.ebuild
new file mode 100644
index 000000000000..621809ba344e
--- /dev/null
+++ b/app-misc/khal/khal-0.9.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-3.11.7[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/freezegun"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/__khal
+	fi
+}
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index f4c4c76678e4..9652cc0ed5d3 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -19,4 +19,4 @@ EBUILD lcdproc-0.5.2-r1.ebuild 5511 BLAKE2B eaa3431092a1e7794f24b7905e1c6c61a9d2
 EBUILD lcdproc-0.5.5.ebuild 5888 BLAKE2B 05f74abb99fba00d7cc2b2d633d0c41a743fe0537426b4997970d7fb2df1c89c5bb18e00ae24b7979a51de365f761672516ee266a6b570ed15deec484a8c8403 SHA512 3141859061d9a3d46814e361022c017ad1fab8eb92cad8a3561f371d03eef033908bd5d85391da5aa7a445309006a998699e2e5e412025ca074df5fd0f5ce130
 EBUILD lcdproc-0.5.6-r1.ebuild 6083 BLAKE2B 6d2a29febe9e6ba72fc254fb6d7c34f850dcf5b87f2115d01713b1eeac3b91b0e9004e2306b56774fe64cdbb261822dae08f50490d756a3f7cd2c58c9f52c006 SHA512 b18c7ccd63592c303081500055ada6e08c408002e0ed52e4a14fd6b799d0c70566104380eeaf1422fab424a9a68176fd37dcb2f99d614efb72587711476cd738
 EBUILD lcdproc-0.5.9.ebuild 6437 BLAKE2B 803505496345bf5fd2fd39ee27442f534e901ce49c1e79698bea44afb82e0ab886171cd397a7bb1379e87521bd3e63467a91ce5303187fbedd8f53f91376488f SHA512 e7e4b02d4693df9a6e0f7b7f16bda22d6b00298458c35f68ac6f60f845c314a24313b32e44f5688ef05049de2bcdcec628b7d7fb4b081faeee2568a5ebf58160
-MISC metadata.xml 2261 BLAKE2B 71a100c5a9e9ff1810f925b027a09337634e6191bc38b828e779e99a92d942979a412d7b13eaf83aecb186dc6f7f55a1a9b743592292814d95225758e28df977 SHA512 e263460ac19220cc16d08a4199d5f623d7018b8c04655d9494db05524cf2e0e9437db2c0d87f22e21e827d4c4185ef0f11e775c515992395ae47a0d835bc739c
+MISC metadata.xml 2157 BLAKE2B 4b4539bd61cdb9e6026a2b32552035f1601436867310469569875275dde9d8c55c2a0a8f161a545ddfa12608351360c3578539699cc0df3701b7af7fbeaef001 SHA512 70fb2fb6503b81394926e44a3d0110cae6955185b2c8d9f40ee9d37c8a967bbc0207318fa17076aa53cb3fa20c5f93e309729b763dc879604df9a8021216c733
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index ab8591e847e6..f54e361fd68b 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ck+gentoo@bl4ckb0x.de</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
diff --git a/app-misc/logserial/Manifest b/app-misc/logserial/Manifest
index 924945d80319..8fbd835559b3 100644
--- a/app-misc/logserial/Manifest
+++ b/app-misc/logserial/Manifest
@@ -1,4 +1,4 @@
 AUX logserial-0.4.2-gentoo.patch 704 BLAKE2B 7591caa786188f9ba051b3e43462c85a096f5d09cad3b7992f03af7329d31e96600d96d450107a6dc3e6ae19cf7a78030e99119a6d4eb3ac6f36c1f1ca2e1008 SHA512 53874fd3d8c1e15af3614f779c1a85c53d43218c13ac508166dfca8c9012d7e251d9fbb3fe22cbcd2167594848ebff5f2e9f48dcad11c153f18abdf2e46233bc
 DIST logserial-0.4.2.tar.gz 9697 BLAKE2B d32b03e50459a65d0072aa961421c6aaef67483d16d6e95b6071fe805f69b79fa1b3a63fb8ce5945fa19f3c912fd6de051549da3edbb2814b7eb4c68c036cc19 SHA512 63784f5f3b84c1fbf85e0b5295ab33c427626562d880de3202b792ad354f93d645d4c2ddb7dc38d48ee25a15df51f1544aa0abea45fccef333553492ed86e9ad
 EBUILD logserial-0.4.2.ebuild 583 BLAKE2B fcd1d9558c8147632dc0f7e86408a52ee57af6b007dbed3f1b7408295e1ccd335a2b366e0db14ed812c4deec952015721e6d5034cdc127e187b378edd51ab2fd SHA512 390d0561a8b6e6177ba66468f850fcde1e4ff63086f5d061674bd8bdad0f94f0d10873d73e361caa6e84daccde05df2944010a2e5272fedeb2fd1ca65b7da737
-MISC metadata.xml 483 BLAKE2B f185b1ee76bdbd2d69171cc52fd98e2859137b5fd4bda92e0917585f589c6ac1e58d97b72c22d2d87d2921c16820367169836dccc5bb44a0259e2d73f34b5860 SHA512 8c7789cc64787fd8a2590921ef0adcf4720d96d211b0308bcfe97e32014d0aa36ae9c2b7bee8cef042617c421787ff4a837ee7b1e1dda789bae4823dfe7d2e8f
+MISC metadata.xml 407 BLAKE2B c580472939660c935fc938ce3a21f41301f844604a862c1e20a256dcf2c003897845536a17f2ea9019a0c44dfeda8dba59c7ea433513509f2e8b143bc7a1b5aa SHA512 109d8f5e8c6c3a3a2c76d65af1a9c677742e1c505edf11b8d9b4c5e917072de9feab9a1e836e4756d9020a20297fb46b1b95b6421066f9fd9fdf4dd8786e8ab9
diff --git a/app-misc/logserial/metadata.xml b/app-misc/logserial/metadata.xml
index 46956d7db72d..b179f1fc8fab 100644
--- a/app-misc/logserial/metadata.xml
+++ b/app-misc/logserial/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Package for loging incoming bytes on asynchronous serial ports. It was
 		written for loging calls on our telephone central, but you can use it
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 75246b74a789..aab6696fb9ee 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -5,8 +5,10 @@ AUX mosquitto-fix-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb023
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1 SHA512 8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
+DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311 SHA512 4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
-EBUILD mosquitto-1.5.3.ebuild 2442 BLAKE2B 139888e22d3441c68fe5901abcf9247a9db13ce8f51389db78ef455bac0ede577b76463651898da6aeefa66615c47c885c4bf55d9e7fbf04f043ad62ad58c1f5 SHA512 cb71c209ebb39f2a5cce3cca59c50aefacf274795537f9b37728ca90d41105e41ef9b34c5f9d891b2874e08e192791ac12fdf172e616c4d685415feb2455812a
+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.ebuild 2553 BLAKE2B e24122599e0d670a92ee3a6b1063d0bd5eb342eae27ea2029f4a60b5e3ddc9c9c98fc07d7cd980ac1d72b9743e7f964210b05f7131101e8330d7974096006df3 SHA512 c73492cff20a123be5122fe37d9c0c4a12ec86d0dac6c18c8257d8999aa31d1696cb4524d5e13bd09d71a6be1545734f1b5cc4d367b65de3aeed11679c9a6e7c
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.5.3.ebuild b/app-misc/mosquitto/mosquitto-1.5.3.ebuild
index 44c2e14ee223..46cf3f99a9ee 100644
--- a/app-misc/mosquitto/mosquitto-1.5.3.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.3.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/mosquitto/mosquitto-1.5.4.ebuild b/app-misc/mosquitto/mosquitto-1.5.4.ebuild
new file mode 100644
index 000000000000..44c2e14ee223
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	srv? ( net-dns/c-ares )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	websockets? ( net-libs/libwebsockets )"
+
+_emake() {
+	LIBDIR=$(get_libdir)
+	emake \
+		CC="$(tc-getCC)" \
+		LIB_SUFFIX="${LIBDIR:3}" \
+		WITH_BRIDGE="$(usex bridge)" \
+		WITH_PERSISTENCE="$(usex persistence)" \
+		WITH_SRV="$(usex srv)" \
+		WITH_TLS="$(usex ssl)" \
+		WITH_WEBSOCKETS="$(usex websockets)" \
+		WITH_WRAP="$(usex tcpd)" \
+		"$@"
+}
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	default
+	if use persistence; then
+		sed -i -e "/^#autosave_interval/s|^#||" \
+			-e "s|^#persistence false$|persistence true|" \
+			-e "/^#persistence_file/s|^#||" \
+			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	rm test/{broker,lib}/ptest.py || die
+	python_fix_shebang test
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto "/usr/share/doc/${PF}"
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "The Python module has been moved out of mosquitto."
+		elog "See https://mosquitto.org/documentation/python/"
+	else
+		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+		elog ""
+		elog "    rc-update add mosquitto default"
+		elog "    or"
+		elog "    systemctl enable mosquitto"
+	fi
+}
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 395e0247014c..e94b8173a5b9 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,4 +1,4 @@
 DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
-EBUILD neofetch-5.0.0.ebuild 693 BLAKE2B 322d42370c759b75c54d4059ffa49a6812878812ec7e00f1b22ffa067788741db2c5777cbc272e7bd7a40c2a5457524faff3aa0f9569373fcf0b9f415c2b26e5 SHA512 b4568a595e5dc2d2c73c42fa7a5fd7d55bd50568ff3f0822ba3bf48d8a189696dd487c882355c6ba706f875368ca2f33dd2f27564334e95372a075e9ce44bf63
+EBUILD neofetch-5.0.0.ebuild 698 BLAKE2B 71422cd78067ef24294890b0df2b5e658403d32dc2cbc1e451c9c235bdc179c11acf362d80168ece7b0aac2926e7c7fe91a0e21f173c462689035b260472e274 SHA512 5b584d0085c16606b7322121cee1b6f3805993bc7ea667659f2eb91ea1ec72e6ad00d5feb64460ff08dd1bdd2cf40d4c3f1a1eb30b9dbf0919e39024ab4381c7
 EBUILD neofetch-9999.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
index 62677c4b07a8..028fbe1249cc 100644
--- a/app-misc/neofetch/neofetch-5.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-5.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 mips x86 ~amd64-fbsd"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 9827568f7186..0b66878b9354 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,9 +1,7 @@
-DIST nnn-1.6.tar.gz 37456 BLAKE2B 90a6bcf7123b763585a05d5898ecee129561fa11dddbc40125f536b96315e4847b6187615df2bb6e0262d3df5efeec83d6681092ed69e4b65cd5486cf396e7e6 SHA512 7172f37f98f15b37cd2959c5ad144d32f55cde9cd2fe3221fc7a23887d3326da924c9be0bdc61a01a4d98ceb9b03de2420a66cc2cbf94a2ae1547da206e4c49a
-DIST nnn-1.8.tar.gz 42534 BLAKE2B acf1f9e211ddf688da96c77364f8eb2d12c853fa528774f2a3f8fa146203b155df089f6a3c995f0415d5349e9bb0c519cd0776c77094a83c23ecfe45561c846d SHA512 dfa3fc20cc9d77dc6a998913d79c1f98467f9e0f475d43317fe5b3b7c85f04a8aa1508305307873115ff810f5e212272e8348af9d8bd5283f48ad76ed34cad55
 DIST nnn-1.9.tar.gz 43405 BLAKE2B c085f13883eb379cc04b225d3a6bdbc95dcfb200a0c338bea82b64841918f41560a0b53ed49be0cf8eaec852eb1575d050197ece197fd655c2a3ba1c6cf20d57 SHA512 44eb3d569429ee27e35c0a1299e7cb248072b470b462a361eec3364163f03f577a1b28819cddfc9a85002d6ae90c61cc0633f0548c58cb154dfd8e6491c73369
 DIST nnn-2.0.tar.gz 45791 BLAKE2B dd6eb88302d39b1d5f321b3fa3a19f97c70477178f7c5678433be47fb8091ba6fa5b78f99dc2e15fb8d2c46fc012bab86b3b3ae1dd162357589e0926ed126d55 SHA512 73d6c0747461648e01b8145451a14a531002e0d005c59a3bef9d6d1a6cfc4ba7210a15879e92037af2c0e1d4c728b9c30894d7b029dedb2925634b4925ce2d72
-EBUILD nnn-1.6.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
-EBUILD nnn-1.8.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+DIST nnn-2.1.tar.gz 48481 BLAKE2B cbf5dbcb2548e21996f3fa5b5399a56644d1e7aed6023c4ca4c2b960b2bab8833b9f8f1bfafb6d2cc2257730ebe1b3a80e0a253d81f154580888517fbfc50341 SHA512 4ce20944df613706545cffb70896b9c494ed0304a591b1ffdae4886ac3783c2c1ab321b336b9873bd8b1382bc9c6ae8e0226f7abb98fb461ed64b28e1302d8f2
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
-MISC metadata.xml 324 BLAKE2B abbc05bbc35735d7a931021eac9e8f9a4584867c885fea581f57d7b4e9d83be1b2b3ec8b5246c1ecafd9c1e55078d66fa1cac22a8321beb5d4912a596c721e48 SHA512 291b497b906b3fdcbee656d90292d5b267c4082d1864e38f64938ce2d3b8aa56ca782d217f3a0776049db5dd7da416a4200e86f91da7075c54998b5901f78ef5
+EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
+MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
index a919cc815a67..203fa55c746f 100644
--- a/app-misc/nnn/metadata.xml
+++ b/app-misc/nnn/metadata.xml
@@ -5,7 +5,4 @@
 	<email>zlogene@gentoo.org</email>
 	<name>Mikle Kolyada</name>
 </maintainer>
-<use>
-	<flag name="fish-completion">Enable fish completion support</flag>
-</use>
 </pkgmetadata>
diff --git a/app-misc/nnn/nnn-1.6.ebuild b/app-misc/nnn/nnn-1.6.ebuild
deleted file mode 100644
index b1965355b427..000000000000
--- a/app-misc/nnn/nnn-1.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion fish-completion zsh-completion"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-		fish-completion? ( app-shells/fish )
-		zsh-completion? ( app-shells/zsh )"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	use bash-completion &&
-		newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	if use fish-completion; then
-		insinto /usr/share/fish/completions
-		doins scripts/auto-completion/fish/nnn.fish
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/auto-completion/zsh/_nnn
-	fi
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-1.8.ebuild b/app-misc/nnn/nnn-2.1.ebuild
index b1965355b427..4d054798eaa7 100644
--- a/app-misc/nnn/nnn-1.8.ebuild
+++ b/app-misc/nnn/nnn-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,10 @@ SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion fish-completion zsh-completion"
 
 DEPEND="sys-libs/ncurses:0=
 	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-		fish-completion? ( app-shells/fish )
-		zsh-completion? ( app-shells/zsh )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -30,18 +27,13 @@ src_prepare() {
 src_install() {
 	emake PREFIX="/usr" DESTDIR="${D}" install
 
-	use bash-completion &&
-		newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
 
-	if use fish-completion; then
-		insinto /usr/share/fish/completions
-		doins scripts/auto-completion/fish/nnn.fish
-	fi
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/auto-completion/fish/nnn.fish
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/auto-completion/zsh/_nnn
-	fi
+	insinto /usr/share/zsh/site-functions
+	doins scripts/auto-completion/zsh/_nnn
 
 	einstalldocs
 }
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 6ee1344b01c2..654d560aba6d 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -4,4 +4,5 @@ DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa
 DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189 SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e
 DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1 SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15
 EBUILD oneko-1.2-r2.ebuild 1673 BLAKE2B 01fb6acabb5e2d39f3634af2ff7d1998580757e4b17538682f3c8563b3c91c1641f0bedfbe418f3578a499fe9873163e09088e783f18f4c1b4e09fe12db9fb1b SHA512 cca224ca83a61edea8ba92bb3a7157756ed96a9dceac9624c4c221ce955646f797efba918df52856480fc3ceb8dd7859244a4051820263a4c2b0ffaa76ca7505
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+EBUILD oneko-1.2_p5.ebuild 1350 BLAKE2B 7820aecbf71866472952d32a10ad9eb38c28f94280eb642410a946454fb1102080897d822e9674737530b89be7cb2c72b3a03b5918ed65a4827e5f8afdabc8ad SHA512 c00df31305553f58e526b2b2b7beccab12f24b83633b691f5958c9b92fda9fc8e22fc5ab9a6bc4e1d1b47b14f2605a9a63aab90a28b2efd93663ffeff2628c16
+MISC metadata.xml 623 BLAKE2B 55087cf6c20ffb041c6f80bb0adbdcc561c282e8de2284e139bf2b9e7156469f356210018f23229e826cc2822e84e88513e29b7dc25dc55eec583e2cb456ed72 SHA512 5f78a9557c5e87edff59075bb5a7d4dac93b4b1745244ad8b89ddcb02e997dc859bf682b7ce4dd774eab4d82e48f8895a86679b24a702e3b054f825b5d6f14f3
diff --git a/app-misc/oneko/metadata.xml b/app-misc/oneko/metadata.xml
index 2ba8e9e851e4..4f979a604e1c 100644
--- a/app-misc/oneko/metadata.xml
+++ b/app-misc/oneko/metadata.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+<longdescription lang='en'>
+"oneko-sakura" is modified version of oneko. KINOMOTO Sakura chases around your
+mouse cursor.
+
+To stop the program, run this command:
+
+killall oneko
+
+If your mouse cursor changes to the default black cross after running oneko,
+you should install x11-apps/xsetroot and run:
+
+	xsetroot -cursor_name left_ptr
+</longdescription>
 </pkgmetadata>
diff --git a/app-misc/oneko/oneko-1.2_p5.ebuild b/app-misc/oneko/oneko-1.2_p5.ebuild
new file mode 100644
index 000000000000..97392a934243
--- /dev/null
+++ b/app-misc/oneko/oneko-1.2_p5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen"
+HOMEPAGE="http://www.daidouji.com/oneko/"
+SRC_URI="
+	${HOMEPAGE}distfiles/${P/_p*}.sakura.${PV/*_p}.tar.gz
+	mirror://gentoo/${P/_p*}-cat.png
+	mirror://gentoo/${P/_p*}-dog.png
+	mirror://gentoo/${P/_p*}-sakura-nobsd.patch.bz2
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/gccmakedep
+	x11-misc/imake
+"
+PATCHES=(
+	"${WORKDIR}"/${P/_p*}-sakura-nobsd.patch
+	"${FILESDIR}"/${P/_p*}-include.patch
+)
+S=${WORKDIR}/${P/_*}.sakura.${PV/*_p}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CCOPTIONS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin oneko
+	newman oneko._man oneko.1x
+	dodoc README README-NEW README-SUPP
+
+	newicon "${DISTDIR}/${P/_*}-cat.png" "cat.png"
+	newicon "${DISTDIR}/${P/_*}-dog.png" "dog.png"
+
+	make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement"
+	make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement"
+	make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement"
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 85e7d2809837..bd7cf7246467 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,6 @@
+AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.2.3-r2.ebuild 1765 BLAKE2B 37602b6c4593bbc53e8b1905647881e0d4454b5bf192b90b00d66506b1c7b57a38cf00d9b126cceff0a96ea245e2a6236ba79675e4a6653e9de9565033714738 SHA512 bbfc6232f0d1d2c81fe39ed35a74d6a7f0f66ef136112f44f8317438047d210e13770b251d9fb446b16b65bb97b9fab18c2a62749d106b9e71bbb9440e214932
+EBUILD pax-utils-1.2.3-r3.ebuild 1812 BLAKE2B c6322cc812a3db52f81ad7495ac9753c29be6f2f5287c97112fe1ed0052e5b345c8e9c8290b261def4a63ca4183d1408d5c448d206a3e231142984173c5db55e SHA512 62661ca64ac3dad190af9cc4c5035e9a4b8c39c21d75cdc354000f0f465b093b39b63690b3ee297f623649a516a994830cac5bc51f76a5a623c3e62290a9598b
 EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch b/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch
new file mode 100644
index 000000000000..40fff21c022c
--- /dev/null
+++ b/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch
@@ -0,0 +1,32 @@
+From 2acc5c3278354f56c70f9f48e66eb0203d5e8370 Mon Sep 17 00:00:00 2001
+From: Oleksandr Natalenko <oleksandr@natalenko.name>
+Date: Sat, 17 Nov 2018 15:43:09 +0100
+Subject: [PATCH] lddtree.py: use errno properly
+
+os.errno interface is removed [1], thus should not be used. In fact, it
+is not used in other places of lddtree.py, so fix this one too, because
+it breaks --copy-to-tree on systems with Python 3.7.
+
+[1] https://bugs.python.org/issue33666
+
+Bug: https://bugs.gentoo.org/671522
+Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ lddtree.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lddtree.py
++++ b/lddtree.py
+@@ -122,7 +122,7 @@ def makedirs(path):
+   try:
+     os.makedirs(path)
+   except OSError as e:
+-    if e.errno != os.errno.EEXIST:
++    if e.errno != errno.EEXIST:
+       raise
+ 
+ 
+-- 
+2.19.2
+
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
new file mode 100644
index 000000000000..880abaa929a9
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit eutils python-single-r1 toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+		)
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.7.patch
+)
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
new file mode 100644
index 000000000000..eea7d2269a4d
--- /dev/null
+++ b/app-misc/pip3line/Manifest
@@ -0,0 +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
+EBUILD pip3line-3.5.5.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
+EBUILD pip3line-9999.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
+MISC metadata.xml 617 BLAKE2B bf8ccd6ecd2783621a6e1c91c216afdf58ae3f4957541fe830fc3a39478331535b50097ae30f51d4ce305cf013cd613b45e3fca41d93b00f0e9a468c3f7b6346 SHA512 49298f62bc28cf669a9308741352fb510a1e7c5ba3749bfe6a9cb284e0ae35be27f672c404c194719440d68c2667f7ac58bb134335c5c95937c1b2e1d5f9e94e
diff --git a/app-misc/pip3line/metadata.xml b/app-misc/pip3line/metadata.xml
new file mode 100644
index 000000000000..9cc54c99226b
--- /dev/null
+++ b/app-misc/pip3line/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gabriel.caudrelier@gmail.com</email>
+		<name>Gabriel Caudrelier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name='distorm'>Compile the Distorm plugin</flag>
+		<flag name='qscintilla'>Use QScintilla for more efficient text display</flag>
+		<flag name='ssl'>Compile the plugin adding miscellaneous hashes from OpenSSL</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-misc/pip3line/pip3line-3.5.4.ebuild b/app-misc/pip3line/pip3line-3.5.4.ebuild
new file mode 100644
index 000000000000..9789c01998c4
--- /dev/null
+++ b/app-misc/pip3line/pip3line-3.5.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Raw bytes manipulation, transformations (decoding and more) and interception"
+HOMEPAGE="https://github.com/metrodango/pip3line"
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/metrodango/pip3line.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/metrodango/pip3line/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# A few comments
+# the ssl flag is just there to enable the plugin for low level crypto algorithms. 
+# It has nothing to do with the SSL/TLS protocol itself.
+
+IUSE="distorm python qscintilla ssl"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxmlpatterns:5
+	qscintilla? ( x11-libs/qscintilla )
+	ssl? ( dev-libs/openssl:0= )"
+
+DEPEND="${RDEPEND}
+	distorm? ( dev-vcs/git )"
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DBASIC=yes
+		-DWITH_DISTORM=$(usex distorm)
+		-DWITH_OPENSSL=$(usex ssl)
+		-DWITH_SCINTILLA=$(usex qscintilla)
+	)
+
+	# distorm is statically linked, due to insufficiencies
+	# in the current distorm64 package 
+
+	if use distorm; then
+		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
+	fi
+
+	if use python; then
+		local targets=( ${PYTHON_TARGETS} )
+		for target in ${targets[@]}; do
+			if python_is_python3 ${target}; then
+				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
+				mycmakeargs+=(-DWITH_PYTHON3=ON
+					-DPYTHON3_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
+					-DPYTHON3_LIBRARIES=${PYTHON_LIBPATH}
+				)
+				break
+			fi
+		done
+		for target in ${targets[@]}; do
+			if ! python_is_python3 ${target}; then
+				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
+				mycmakeargs+=(-DWITH_PYTHON27=ON
+					-DPYTHON27_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
+					-DPYTHON27_LIBRARIES=${PYTHON_LIBPATH}
+				)
+				break
+			fi
+		done
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/app-misc/pip3line/pip3line-3.5.5.ebuild b/app-misc/pip3line/pip3line-3.5.5.ebuild
new file mode 100644
index 000000000000..9789c01998c4
--- /dev/null
+++ b/app-misc/pip3line/pip3line-3.5.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Raw bytes manipulation, transformations (decoding and more) and interception"
+HOMEPAGE="https://github.com/metrodango/pip3line"
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/metrodango/pip3line.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/metrodango/pip3line/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# A few comments
+# the ssl flag is just there to enable the plugin for low level crypto algorithms. 
+# It has nothing to do with the SSL/TLS protocol itself.
+
+IUSE="distorm python qscintilla ssl"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxmlpatterns:5
+	qscintilla? ( x11-libs/qscintilla )
+	ssl? ( dev-libs/openssl:0= )"
+
+DEPEND="${RDEPEND}
+	distorm? ( dev-vcs/git )"
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DBASIC=yes
+		-DWITH_DISTORM=$(usex distorm)
+		-DWITH_OPENSSL=$(usex ssl)
+		-DWITH_SCINTILLA=$(usex qscintilla)
+	)
+
+	# distorm is statically linked, due to insufficiencies
+	# in the current distorm64 package 
+
+	if use distorm; then
+		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
+	fi
+
+	if use python; then
+		local targets=( ${PYTHON_TARGETS} )
+		for target in ${targets[@]}; do
+			if python_is_python3 ${target}; then
+				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
+				mycmakeargs+=(-DWITH_PYTHON3=ON
+					-DPYTHON3_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
+					-DPYTHON3_LIBRARIES=${PYTHON_LIBPATH}
+				)
+				break
+			fi
+		done
+		for target in ${targets[@]}; do
+			if ! python_is_python3 ${target}; then
+				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
+				mycmakeargs+=(-DWITH_PYTHON27=ON
+					-DPYTHON27_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
+					-DPYTHON27_LIBRARIES=${PYTHON_LIBPATH}
+				)
+				break
+			fi
+		done
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/app-misc/pip3line/pip3line-9999.ebuild b/app-misc/pip3line/pip3line-9999.ebuild
new file mode 100644
index 000000000000..9789c01998c4
--- /dev/null
+++ b/app-misc/pip3line/pip3line-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Raw bytes manipulation, transformations (decoding and more) and interception"
+HOMEPAGE="https://github.com/metrodango/pip3line"
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/metrodango/pip3line.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/metrodango/pip3line/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# A few comments
+# the ssl flag is just there to enable the plugin for low level crypto algorithms. 
+# It has nothing to do with the SSL/TLS protocol itself.
+
+IUSE="distorm python qscintilla ssl"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxmlpatterns:5
+	qscintilla? ( x11-libs/qscintilla )
+	ssl? ( dev-libs/openssl:0= )"
+
+DEPEND="${RDEPEND}
+	distorm? ( dev-vcs/git )"
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DBASIC=yes
+		-DWITH_DISTORM=$(usex distorm)
+		-DWITH_OPENSSL=$(usex ssl)
+		-DWITH_SCINTILLA=$(usex qscintilla)
+	)
+
+	# distorm is statically linked, due to insufficiencies
+	# in the current distorm64 package 
+
+	if use distorm; then
+		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
+	fi
+
+	if use python; then
+		local targets=( ${PYTHON_TARGETS} )
+		for target in ${targets[@]}; do
+			if python_is_python3 ${target}; then
+				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
+				mycmakeargs+=(-DWITH_PYTHON3=ON
+					-DPYTHON3_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
+					-DPYTHON3_LIBRARIES=${PYTHON_LIBPATH}
+				)
+				break
+			fi
+		done
+		for target in ${targets[@]}; do
+			if ! python_is_python3 ${target}; then
+				python_export ${target} PYTHON PYTHON_LIBPATH PYTHON_INCLUDEDIR
+				mycmakeargs+=(-DWITH_PYTHON27=ON
+					-DPYTHON27_INCLUDE_DIRS=${PYTHON_INCLUDEDIR}
+					-DPYTHON27_LIBRARIES=${PYTHON_LIBPATH}
+				)
+				break
+			fi
+		done
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/app-misc/pystopwatch/Manifest b/app-misc/pystopwatch/Manifest
index 1b8f0487289b..2c004144705c 100644
--- a/app-misc/pystopwatch/Manifest
+++ b/app-misc/pystopwatch/Manifest
@@ -1,3 +1,3 @@
 DIST pystopwatch-2012.12.24.1.tar.xz 14580 BLAKE2B e9f6deabe932bb4adc658d5b5ebc0cc7f2de461a287773881c6d1f34e7f50a0b23b3b317344994a2717998fe6e611167ed0a5d380235f6b1a5e3f572964e7609 SHA512 4b3af373356eaafd14caeecb34150fef8e7099120855230dce7c0eabba68f75d497c3cc2eb733a086a02a96ae5feeca1898ba201a5f6f5597dcd32de9c80b3df
 EBUILD pystopwatch-2012.12.24.1-r1.ebuild 662 BLAKE2B 3fe88735f4eb936c4c6c8902e373f07da6430e69651fed927a2ff5c8994d4f566049f6935702b926f462833eee4c8a7f116e7ea802afca3f4d220e374c4c8bd3 SHA512 f77107c57ef88a9e6faaf8a26c024d5ad6e1405c67c3c54ce32cd085da1d7fa023a8d2f6e70277c408117c1c1c48749eabcadf93117666bbc9b3e207e18545e0
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/pystopwatch/metadata.xml b/app-misc/pystopwatch/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/app-misc/pystopwatch/metadata.xml
+++ b/app-misc/pystopwatch/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index 10d002711569..8c19a1685861 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,4 +1,4 @@
 AUX qlcplus-4.11.1-qt-5.11.patch 7589 BLAKE2B 30aeafe90d1013fabe5d2f059ad483a3ddef64edeb691bf7a21b818b946cdbe028d52e4a13e29b0c0c571504dc0cac215e93584bf5a71f6ccfbdd807a16faf3d SHA512 e9b1b160463356a7a9c7768a55435a50a9c7081b342807bdd83282bc500a186f81420402db321463bb2e2ad29db95c3b8b33a7621aa481e34668420c85213636
 DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
 EBUILD qlcplus-4.11.1.ebuild 1347 BLAKE2B 555ec645507ebf489201fa36bbfefbcc6cf100fc096c7db0d8b958310806c1b98f8621de9793f28a27bcedf68616b896b9da07e290cdbe6390b80faab7507f1c SHA512 84a6cf8545c8b8f2b9c23650fa43aa678e65b7811a6ed7d3359e88bfd19b02807bb1ebced96ea15c41cfcc869c75f0920dd90759278b8917a707a784f1cc758a
-MISC metadata.xml 326 BLAKE2B 8d391e1f300d364a5e985caad82387023c6f9d6081313b571ece49d2f5daf60f25527685bb7567ad18cbe3234202f8fe53b0a786b401477687b5b8ec39dfc1d9 SHA512 5de2dc43ec5ae4d9a2c598cfac00dc124a956040d0721cb867acc5c4ed312e8c9ef415205eaaed8ff5742281251c970a5ade2eae6280b62477f4fda3fedc2504
+MISC metadata.xml 250 BLAKE2B 53c17a4fb4e05e8f9a5ea7ebb0a760d79c9dbca2bd559e3f3130c3d3bbb738252cc9b365779151066c28380e128f36857024b13b79507bcf9b95d60218c00385 SHA512 9a417c6f3642841781d415d84437664c9adae33bd47c109570dfcb8dc4f09eb1ebac23ff009df8568ba0113d915588598f21fd7911ee8ed5651ebf737db9fbde
diff --git a/app-misc/qlcplus/metadata.xml b/app-misc/qlcplus/metadata.xml
index 66cfad42c5fb..cba9309e7539 100644
--- a/app-misc/qlcplus/metadata.xml
+++ b/app-misc/qlcplus/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mcallegari/qlcplus</remote-id>
 	</upstream>
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 62f033328730..8c92bec2d349 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,6 +1,4 @@
-DIST ranger-1.9.1.tar.gz 245872 BLAKE2B 3ed48c4fe0cb42be7e001508a9c1f558e415e155eb5f68c9a8eb3e6d906ad287080391ab0310c0e9d67c9bc3210621827dc11107d99ac4173a4d8c64d74ab28b SHA512 c7fdc8f423860c7c420d7be61ebcc92629e444529c982f24260a9eeb68452adbbc6d40d53921c556da3d08a75b1c718bb05257cf869a15f7d932e8f00836cfe3
 DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
-EBUILD ranger-1.9.1.ebuild 1065 BLAKE2B 06dea5593b053c4c0d7647b1b38f43bc291d7c9be43794cc06427e43a40c4aaee0b0d72a6f6fee003df6a2c411775db366e7a7d455b0f213f21893a7c4bfa03e SHA512 a925b2488f4200635397ed3df7d6c05a6d689afec3faea143fe553532bb241eaa1783ca04525915a17afe34e294116a32f6c4bc95b71725bed06e3965b8c4a33
-EBUILD ranger-1.9.2.ebuild 1067 BLAKE2B 23524c8eebfd5d84974df81e8ab781b155558563d42900d87145561f850e2f1433709f54387f91933ff92231342477df486f6bf79850126211aa36505abeaa62 SHA512 a669db30a0478fdeca3778054acccfce5e9cfb388b009d32afe15a3490f21e89fcf130c5f659b0d5e7a8f88001bdf48630572ac31314f02e1a01c2062c66ca65
-EBUILD ranger-9999.ebuild 1067 BLAKE2B 23524c8eebfd5d84974df81e8ab781b155558563d42900d87145561f850e2f1433709f54387f91933ff92231342477df486f6bf79850126211aa36505abeaa62 SHA512 a669db30a0478fdeca3778054acccfce5e9cfb388b009d32afe15a3490f21e89fcf130c5f659b0d5e7a8f88001bdf48630572ac31314f02e1a01c2062c66ca65
+EBUILD ranger-1.9.2.ebuild 1066 BLAKE2B 6fb8c97358bfc55e128ccd0288ca515e45b9f8e7d53160b010ff1c08736c68d0720cd3a8dabcb0d396c810e1f3b41b7abf97677a51fd6eddc546d9eb5dc239d4 SHA512 47ae3726af7a74fd6823ac0e003b83b36ec4bf91c297a1100e34a96e0e0a764ad2ebb2a07a76329fc8ef23b7f648398b5d70b4e839cd8193ea20826ccfb54ef0
+EBUILD ranger-9999.ebuild 1068 BLAKE2B 47becec9a1e654d590b4d87f764ba8a208c4a17009a94059d6f28ae16b55452728a37bee02f4bc1472efb84c4b3bf8f702c802d6f002325dde945d01894ba1a9 SHA512 e9bf53da055617f7c0e2d31a61fe37153eac9de966a7af28f76f0d9981c386b4952b6dca20728973e43dfdac59debba98aaa3c78f21a715ba5d3ef8271518ef2
 MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54
diff --git a/app-misc/ranger/ranger-1.9.1.ebuild b/app-misc/ranger/ranger-1.9.1.ebuild
deleted file mode 100644
index f5ec117b98ea..000000000000
--- a/app-misc/ranger/ranger-1.9.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ranger/ranger.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-fi
-
-DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="https://ranger.github.io/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="virtual/pager"
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	# use versioned doc path
-	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	py.test -v tests/ranger || die "Tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Ranger has many optional dependencies to support enhanced file previews."
-		elog "See the README or homepage for more details."
-	fi
-}
diff --git a/app-misc/ranger/ranger-1.9.2.ebuild b/app-misc/ranger/ranger-1.9.2.ebuild
index 363a06f282ac..07f8d5c9546d 100644
--- a/app-misc/ranger/ranger-1.9.2.ebuild
+++ b/app-misc/ranger/ranger-1.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 363a06f282ac..b6c3b9b08aaf 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index d4867138c25d..d70982d14e91 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -1,4 +1,6 @@
 DIST reptyr-0.6.2-sysmacros.patch 598 BLAKE2B 12e024efd3a7c2e07f1930545f2c5ee78212ac0f30095208c7cd2678c66f48038576d32b1f969cf9018db12b8fcd27f900257701bc66873326cd820c2ee57c14 SHA512 2d6c711a1d1268557925d15cf5d8154bc4ce47b5475ad05a5d358fd94a882991f33a8d99608e511d15dea6c08dcac615467f52bedb46330868540b03302e0cc9
 DIST reptyr-0.6.2.tar.gz 28533 BLAKE2B 305aeb5619c1780bbc189a64786ba1148c730e518ea8fe3c5daf715fcbe0de3ad7bd107008fb2471b8a3b61e75406ebb32d99b2eb5323badbb9e5f10ed1e65dc SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327
+DIST reptyr-0.7.0.tar.gz 30718 BLAKE2B 7cdb3c95deeab82898d41dd5047cd15ff288229145b64fce8efc5360d205a575a4f421ed52885c6491d56858fb7d1f09f0e8588a3be62d021bd26e554bb1ed25 SHA512 d95a05634f7e4e55f487577baee50fc773f0d9957be5ac1a678bd0434baffd994c08a884496f6400ee101333c310eaaf2150f9053d3b4b6e525820a7ed24a8e6
 EBUILD reptyr-0.6.2.ebuild 952 BLAKE2B d3b5e34cc1989043a47e8d13eb066fb588688a588c256efc29991f625c01409a3e01178342a4373f2996467643395031ea30187cf1efbf80366b095677fc884d SHA512 6b70da39e56db290e52af8589437452214f458e8d28487f796000ddb4036427a798f0b38f4766860e3fc0cabdc26248823d18deb78ce80ac9a073a0b4d0cb57d
+EBUILD reptyr-0.7.0.ebuild 764 BLAKE2B 40ec574b493efa6d981f6b28c6628970529a2f9a740f5fbd67d5da69f5c898bfa9993220eb7a704529ac8e7db09c1a0fd11da0e782caa74b41adbe725ed2b5cd SHA512 98f78d3838eb6ce6e65548958e7ee787c5b1f2512769c17881a3be8768426ffce2894284907666644c403ccbacdba8f420afa46ae229ea3668a161a777cb8d8f
 MISC metadata.xml 472 BLAKE2B 60fe70a0a1d8761764b853a0b6a05656019e3e4c9d04a7b79b884d35b9bb112a0aa66ae4b7096d91c25fafc34dd6ea248119887eb0a44c132b7b38c6fe993d87 SHA512 6b0c72aca4cc7c33cc37aa366292889fb6907d10c6e31bb140c98b30b1bde79a81dd188d5b2b5a1eb338ca8ebb41d05c2fe9d5158d780fa4cf3ea772476166ff
diff --git a/app-misc/reptyr/reptyr-0.7.0.ebuild b/app-misc/reptyr/reptyr-0.7.0.ebuild
new file mode 100644
index 000000000000..d8ca305260d3
--- /dev/null
+++ b/app-misc/reptyr/reptyr-0.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot
+
+DESCRIPTION="A utility to attach a running program to a new terminal"
+HOMEPAGE="https://github.com/nelhage/reptyr"
+SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# respect CFLAGS
+	sed -i '/^override/d' Makefile || die
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc ChangeLog NOTES README.md
+	newbashcomp reptyr{.bash,}
+}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index e7d9b46759e0..c838628f2497 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -12,6 +12,7 @@ EBUILD screen-4.4.0.ebuild 3969 BLAKE2B 9777dcbd9eaadba0a16fc019e5af58740eb10181
 EBUILD screen-4.5.1.ebuild 4116 BLAKE2B 46e39151346890b58663aa75b214a99b96bbfb06bdf9c03cf3c8f99aeea7cf38659fc14e8412bedbab3f32e2c2bdbf70a89cecd1f9708e451b904bfdfde7dc93 SHA512 5b674abdaf9001196c0190359254718f87902cc05b2170a51a3bcca2d5f7c654d78cd98945f3bf15e4374f8c32a4b800f971b3ed4079247d032e39d595c92cea
 EBUILD screen-4.6.0.ebuild 4064 BLAKE2B 6091efb4d2f52bd5c2e128623b86e9ba731afba4e850118225fa8b911814b1e68f3882464a6d29d26effc3067d2417a649db4b4791322e5b122ea26b50e230b0 SHA512 72ccce15b6b5c9407ae311ba6308b03f88eecba8b88b160a1b02430f45e4154754c1c9682e456afda2ed08ff204f60b74668f28db3c8eac33c0576d73c4630a0
 EBUILD screen-4.6.1.ebuild 4051 BLAKE2B 2059f207ee7210b1d2429d1f77f6b6ddfc385a35677284d4b0b50e13b68c38898d9a9e88dfc83ce20b5281bbc212c36ec67aadc725b36e2a7cd6d6cb5b6df348 SHA512 19c7644857ae0144676659aaf92b6ad671f0b46c184ff63ec578fa2989c632bace893f00828f691348b8ef22a14203b088e4f82da43a4ac478a0cba12c181ec4
+EBUILD screen-4.6.2-r1.ebuild 4089 BLAKE2B cc84459814a932928b7fce199627381ebf927400089d58916957ea22206630b5f1818c2a53fc80019774a032ad15b950220e61c516f2733ac9556a04c9e899b2 SHA512 ecbf7c71987173e8f0ba2e45e9b32f5bdf3ea09bcbbc776584437ec687e942ebe266be0aacd671456225a748d43f5371978bc91a3748cada31b70c0de011a7e9
 EBUILD screen-4.6.2.ebuild 4100 BLAKE2B 57800241f7bca48e44821110ee35dc58eab83801d6fe19de0a4c70f4a42820ed825c81fcf9317edd8ae741efc8aaf28325124643a3cb3454de541d8945c5abf8 SHA512 91fadd575ad2b9600377e877c9c032115669933026e9be16f679757699caabcf9c49217d53b6fb8f10347c021e1fd18022702955ec450984cd2c57b211807238
-EBUILD screen-9999.ebuild 3746 BLAKE2B c8bbcdc221e6e4e310aa161e4faad0a517579a1ee9d639957356eeac1cda6f437b33b7780877d87a2f25881a52b76f9e4e71d8760c55a92b2ef790c2af12aeb7 SHA512 07fee252dc398dc18edd4aceebc3ca9d0a86e4523593bb58983ff401fcb7cfffbb969d60563ec8e657e944b14952d462e1d9dc61e274ffff869421673a90f1ed
+EBUILD screen-9999.ebuild 3986 BLAKE2B e40e9ca5125c3e788e9e8346bfbc124d94b28bc6a2f3cc13f2d12313efc883371c5e4bfe13ff77d0f4e2ff5c23a06d043501a8be35b8b40ea7972bc2d445bebc SHA512 e522598323cc369af7cd5e3876fbece8beb92c1d65a3075ced97753d951f30e4a4134e9e88a0d42bc7f32b1977f3fd08aaeab2b4b2d9bade370e8346181d17fa
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..3d5650e31470
--- /dev/null
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	pam? ( virtual/pam )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+	sys-apps/texinfo"
+
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${P}-utmp-exit.patch
+)
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	default
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 \
+		|| die
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# reconfigure
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/tmp/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam)
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	emake DESTDIR="${D}" SCREEN=screen-${PV} install
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/screen-${PV}
+		fperms 2755 /usr/bin/screen-${PV}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]
+	then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	# Add /tmp/screen in case it doesn't exist yet. This should solve
+	# problems like bug #508634 where tmpfiles.d isn't in effect.
+	local rundir="${EROOT%/}/tmp/screen"
+	if [[ ! -d ${rundir} ]] ; then
+		if use multiuser || use prefix ; then
+			tmpfiles_group="root"
+		else
+			tmpfiles_group="utmp"
+		fi
+		mkdir -m 0775 "${rundir}"
+		chgrp ${tmpfiles_group} "${rundir}"
+	fi
+
+	ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index c7c5f5638521..92a319ff1fa5 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,18 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3
+inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user
 
 DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
 HOMEPAGE="https://www.gnu.org/software/screen/"
-EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
-EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+	S="${WORKDIR}"/${P}/src
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug nethack pam selinux multiuser utmp"
 
 CDEPEND="
@@ -29,7 +36,6 @@ DEPEND="${CDEPEND}
 	sys-apps/texinfo"
 
 RESTRICT="test"
-S="${WORKDIR}"/${P}/src
 
 pkg_setup() {
 	# Make sure utmp group exists, as it's used later on.
@@ -87,41 +93,38 @@ src_compile() {
 }
 
 src_install() {
-	local tmpfiles_perms tmpfiles_group
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS*
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
 
-	dobin screen
+	emake DESTDIR="${D}" SCREEN=screen-${PV} install
+
+	local tmpfiles_perms tmpfiles_group
 
 	if use multiuser || use prefix
 	then
-		fperms 4755 /usr/bin/screen
+		fperms 4755 /usr/bin/screen-${PV}
 		tmpfiles_perms="0755"
 		tmpfiles_group="root"
 	else
-		fowners root:utmp /usr/bin/screen
-		fperms 2755 /usr/bin/screen
+		fowners root:utmp /usr/bin/screen-${PV}
+		fperms 2755 /usr/bin/screen-${PV}
 		tmpfiles_perms="0775"
 		tmpfiles_group="utmp"
 	fi
 
-	dodir /etc/tmpfiles.d
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
-		>"${ED}"/etc/tmpfiles.d/screen.conf
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
 
 	insinto /usr/share/screen
 	doins terminfo/{screencap,screeninfo.src}
-	insinto /usr/share/screen/utf8encodings
-	doins utf8encodings/??
+
 	insinto /etc
 	doins "${FILESDIR}"/screenrc
 
 	pamd_mimic_system screen auth
 
-	dodoc \
-		README ChangeLog INSTALL TODO NEWS* \
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
-	doman doc/screen.1
-	doinfo doc/screen.info
+	dodoc "${DOCS[@]}"
 }
 
 pkg_postinst() {
@@ -145,5 +148,5 @@ pkg_postinst() {
 		chgrp ${tmpfiles_group} "${rundir}"
 	fi
 
-	ewarn "This revision changes the screen socket location to /run/screen."
+	ewarn "This revision changes the screen socket location to ${rundir}"
 }
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index 31029e8c7287..5d65a89bccbe 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -2,27 +2,21 @@ DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
 DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
-DIST byteorder-1.2.3.crate 18805 BLAKE2B 2d5a74233f17778ee20220f9bafed13185b08fee92279a597d2169225bfd48e087031f2f7350ddc0344c002d97bbf992136d4b98416c70e2bde7e0e502a4d67d SHA512 336c9ac26d897042554d4c7c00a5c47cfdfa2a181511a7247b292c342156450c6cac95a2137d6f6a45f59ff1ef351a18dc73fb75e9e0c5b0b3a90d7026d39dc1
-DIST bytes-0.4.8.crate 46023 BLAKE2B e83cf53fda9c1e9338e644d0f8b4c33565b693b8c39b26ae8ad2f82dc74b9337361354f6ab5f1eae9cfe928955443b094f0f0627d6aee80e8529ebcc44f54ec4 SHA512 f56cae4af641757bfce2d444c235e92e01a9d4db66efa96e39c06b49af53c966a3bfa351130f3a5f13b4ea156b8ae9416065f66188361433cfaba475b8f321b5
 DIST cc-1.0.17.crate 42064 BLAKE2B 1b21666998f1a4746b069f0ac034b35203b52cb1bf712b5cd9bd2414b83121b0b8a6770b97b518843f7b65bd1546fcf448643a56bfc3e5b91a839afaf8f9c15e SHA512 565f93c7b1803e484f3602f9942c8d6f30e117c299dbc603cd187dd15f136d737cf84fb6138b405ec4d6e381f1ba2f3c0acb845fcb39b92f6e24c8f59a098c5a
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST clap-2.28.0.crate 186934 BLAKE2B 6885cb7a74077b1c72feac97471c08a456f5e826e42b95bb1768027fca127696a457cbb8069e624196e1c77e55608b8ec6b157bfa3e8a661dc0c9b67af903c9c SHA512 737bfa82008082d75ef5f36c5aa505af8e11ff08b7ec824a69f37dcafe1d7ea8e4909a94cf5de218f9bde4cd304e8ec57441b195d936b7db43e8b5881fda0d01
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
-DIST gcc-0.3.54.crate 37248 BLAKE2B e1e14c117776c6e194625223b027ff90b9fddc179ff381bb5649b7020dab10bf06a17237a8473ca9e7dff9c713da899314aeb9251e94fd0eacc8bdb94d68c7e0 SHA512 83b5371d33bbc67dd08d46bdaa3636e09a98078f7474912b92c20bcbc027ecdad65b1cae80f427e5508e1bf2de896c8c536375144aecaf0cbcdfdb7368ff97c1
-DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 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 libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
-DIST nix-0.10.0.crate 124570 BLAKE2B 2af23108f2e9403cdafbfa3b7b6fea9aab4c9006a6f16145d273833c845c4d3abea762d7f3720d54aefef0cebc4c55675b5a79ca7bf61184846276c543c1499f SHA512 335bb939af0132511798e6c8cd259e82b6c5570a51b2dffab8c7c1c1ef13f473ead04bb5d99ad2aa383ea3529d6ec526a1c5dd0adf501d37406cbf3113b453df
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
-DIST skim-0.5.1.tar.gz 77080 BLAKE2B 9fa7e9f8d838cfc0608894177a1ca34da6e056bb2831eaea781b687b24f89bc865a710296191a986762d20169d20c3406562e291974a2d444bd95782c4cda48d SHA512 871d975e31fba4762555525b6ef22caf92a6df6eba9f6f1f2a7271569b6aa0af60352fedc515e6c6e614607546e943699f40acb8f3df819646c562a5171d77bc
 DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde112b9c8b4dde08780d7d50cb8bb4ec2ef555df941be4e89f1f3aa49b335e640702bf8b10e609d6cfba211 SHA512 018962a728b9729b51afdc8975cddeceec84731f43b776a740ad2b4d2a479ceadd7a4d45c6eb5389ef73cdf18955a74ac85e9bbb4ad823e4d4a5d9972a4aa19d
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
@@ -36,6 +30,5 @@ DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD skim-0.5.1.ebuild 1451 BLAKE2B ec697e1f1632e95d4ba19ffa17d3a159877d0bd1a5b8eec513f9f8967592a0802a5c00606878d4b45fbb45dcb7f426e16d9ce7858635d8e04d8393b62b995d84 SHA512 847cc1a5baaab324a1f0cabd3c78ddebb8c6fb0ba50793cfd284cdd9c03b301ef186197cab837a6af75800d164c35dbbb1630ec0ffdcc0419ecdccb3ddfe5707
-EBUILD skim-0.5.2.ebuild 1454 BLAKE2B 609284af9a547b3a82d89243a6e121004886fbd8048c93e661764c0f2b0248b1e750820e19acc739f6f3faf178a8da8725151f0494a4e7e2da3a63f29a7877df SHA512 d6792f8e346b57443d92b55a082c1e408628df63573d30d1bdba1f325d12936bb95f669d237ec68dc95abea9832dcbf0221a2c2315fcf026e955e9a5f08fd347
+EBUILD skim-0.5.2.ebuild 1453 BLAKE2B ef507de64a7662c061c7fdfab0d6fb60d8c2c92b772ca180e2f32a610740513f8986a0f1fc6616e356fd7d9cbdeb5ee1309a596de6a38e1de972010abb38b7bc SHA512 c724d955573262ebf63c24e2269ea4186e66304ea3dfa8c6c1d9f6e4f7f7c82dd7289b9e20b135664c312a49bd57318fbdcd2ccd8db67a6d8068e4e45ab1ae05
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.5.1.ebuild b/app-misc/skim/skim-0.5.1.ebuild
deleted file mode 100644
index e22df2b1a748..000000000000
--- a/app-misc/skim/skim-0.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2017-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.4
-ansi_term-0.10.2
-atty-0.2.3
-bitflags-1.0.1
-byteorder-1.2.3
-bytes-0.4.8
-cfg-if-0.1.3
-clap-2.28.0
-env_logger-0.4.3
-gcc-0.3.54
-iovec-0.1.2
-kernel32-sys-0.2.2
-lazy_static-0.2.11
-libc-0.2.42
-log-0.3.8
-memchr-2.0.1
-nix-0.10.0
-redox_syscall-0.1.32
-redox_termios-0.1.1
-regex-0.2.3
-regex-syntax-0.4.1
-shlex-0.1.1
-strsim-0.6.0
-termion-1.5.1
-textwrap-0.9.0
-thread_local-0.3.4
-time-0.1.38
-unicode-width-0.1.4
-unreachable-1.0.0
-utf8-ranges-1.0.0
-vec_map-0.8.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="a command-line fuzzy finder"
-HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim test"
-
-DEPEND="virtual/rust"
-RDEPEND="
-	tmux? ( app-misc/tmux )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-src_test() {
-	cargo test -v || die "tests failed"
-}
-
-src_install() {
-	cargo_src_install
-	dodoc CHANGELOG.md README.md
-
-	use tmux && dobin bin/sk-tmux
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins plugin/skim.vim
-	fi
-
-	# install bash/zsh completion and keybindings
-	# since provided completions override a lot of commands, install to /usr/share
-	insinto /usr/share/${PN}
-	doins shell/{*.bash,*.zsh}
-}
diff --git a/app-misc/skim/skim-0.5.2.ebuild b/app-misc/skim/skim-0.5.2.ebuild
index 8a165d55e456..ce539d637b2e 100644
--- a/app-misc/skim/skim-0.5.2.ebuild
+++ b/app-misc/skim/skim-0.5.2.ebuild
@@ -46,7 +46,7 @@ SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tmux vim test"
 
 DEPEND="virtual/rust"
diff --git a/app-misc/toilet/Manifest b/app-misc/toilet/Manifest
index 802caf2cfc22..71c508f8dbb3 100644
--- a/app-misc/toilet/Manifest
+++ b/app-misc/toilet/Manifest
@@ -1,3 +1,3 @@
 DIST toilet-0.3.tar.gz 864880 BLAKE2B 824ed5ecf4ee7ae470290f5fa33fdf6489098481b92370138a75c3a50ef1a1f9e9d6572de06c257272b97c45ca27246e52d9342e77d794917553176c1b301dd0 SHA512 64b9389562a51e7dba6e3f1dd27c5340f90df25d8fbf1e041b539f5243b5b6b7af1ebf033a511053ad72a73908d496a1f3d14c4ac656425aefb8364a0664ceed
 EBUILD toilet-0.3.ebuild 661 BLAKE2B 8dbfc46c2607793eb83f2ac2ed5a62111f1c56a6857a3bd5bf3746bb891439a8aa08fd73b6c464954ea1b2af99a5d094646581473cc2d251b03970445418a558 SHA512 cbb0a9290afd871c54351f9a9a9d900fa840f3985abc1dfa0fa0f44762a2edebb1f0a53a1f3cdce4c4ad024c0e9e0e877351952bdfd69b36a78906e526c74884
-MISC metadata.xml 249 BLAKE2B 1722f80741ce712dbd34c3303b85c48066798ae7615211d818bf6eb72e8d6c13ca8481bcc772589180897ee04b3cd4775cc57476a810919b7d0869636487fc41 SHA512 01701bb0df421af74cc138746d8846d9eec35835e817789624027ed0b48504e72a3484cece45950f005d39e5e23eb45f595b89085878f28a273e883af1673be3
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-misc/toilet/metadata.xml b/app-misc/toilet/metadata.xml
index 57798f078517..1b2becffa26c 100644
--- a/app-misc/toilet/metadata.xml
+++ b/app-misc/toilet/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 0b81af2a95a1..b43b8fe382a4 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-EBUILD tracker-1.12.4.ebuild 7607 BLAKE2B 81fad33e737d27d9c27f4f9817a5f38a96d51e8d56f03e04da8b5ad4a131bd73243a2046cf2401bfbdcadaa6058da9fcf3305a816cd975f4134db06245a9b121 SHA512 cf76e06d94b6d64930ffdf04e9aa9f660f294a2ed7360f8a99fdd220747e08d376eb44c4b46194dd599357f2ef3e0abf56d21dbfd69ad366ace1c0172447fca3
+EBUILD tracker-1.12.4.ebuild 7571 BLAKE2B 7077e2536921cbf564bf92e9ec226f9e10379567f0d47dd89fbfcd1bc8318d4c286e100c759a4f8b9a2d696330748dfa4b973236fbf5c498413c3a0654603c1b SHA512 4ddf3e6d98f74601af816a3a404a06934faff2aec56f3fda2613c915997c8dc5868bca417a3ff7f1d4b5073eed7ddf768e8f947b8f85a46a58b5c60c87ba3c58
 MISC metadata.xml 1561 BLAKE2B ce0e9984983c7e0f249af4d375361f64236fb38d105b9ce2cee6c12519c70d4e8c7801a6000adfe777b2f9bb787c47779246b148dbbb5ec6fb6e94356413d8d3 SHA512 89deedce6c26547cdc8a2b3ff1880662125b73f490293156904a942acf632e1325dbc3657cdd6a1ca53cdb7556adbd96fea2705759a0a5503e80ae95d90045c4
diff --git a/app-misc/tracker/tracker-1.12.4.ebuild b/app-misc/tracker/tracker-1.12.4.ebuild
index 0cc6d681e2d8..509c22fab243 100644
--- a/app-misc/tracker/tracker-1.12.4.ebuild
+++ b/app-misc/tracker/tracker-1.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,7 +64,7 @@ RDEPEND="
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.2.9:= )
 	jpeg? ( virtual/jpeg:0 )
-	upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
+	upower? ( >=sys-power/upower-0.9 )
 	mp3? ( >=media-libs/taglib-1.6 )
 	networkmanager? ( >=net-misc/networkmanager-0.8:= )
 	pdf? (
diff --git a/app-misc/wipe/Manifest b/app-misc/wipe/Manifest
index 571e6a1993a5..a9881a15d63d 100644
--- a/app-misc/wipe/Manifest
+++ b/app-misc/wipe/Manifest
@@ -1,4 +1,4 @@
 AUX wipe-2.3.1-LDFLAGS.patch 470 BLAKE2B 76b63c80c561bea0fa5bea750b7eae9c6b07b516c6b4ae7b0949fa3e60b2b9c665afb28d48abf5b1c6f6a97062faec16a8f8145a24a461e71cbecb1d67a75b1b SHA512 e44d409f8177466c22c5a76fcb242e424d4584e587c6a8e25c5d3d8adb976b11a5cce2e0a77b99833a06879a4df3bdb2c71e468f08b7c7b2888b5ed1907dbd79
 DIST wipe-2.3.1.tar.bz2 72297 BLAKE2B e4c15e3b2f64d21d05b915af2c841518f686bec297a6b97eb91b57c1af2e5fb70193f54718ca2f9fa9d04ba684ca21f116b75328695e29f757fe44c62c8504e8 SHA512 63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110
 EBUILD wipe-2.3.1.ebuild 792 BLAKE2B 6f93fee4cc851e862cb3a35a39d27ae66e7cd78221095ce620f2babd641b8d6c6dfd88a493f80cd0aeb316acc00f5b6c8e0306b5471ac1c61deb5e3837e3bb8d SHA512 33d3351e8e5f15481f7c82ca86107d5f97ec6e95ae126cf3f073993223a64b737ed128066446ca5feba1a2ca6834435e7e1de072288e8ff8e6a88f4c80cbdd46
-MISC metadata.xml 317 BLAKE2B 3b1e4414ce9e5ed8fc5e6b88c064937c1b484a1bd39117a3d1709bcae5ab185d66c4879c7e7f18027aa9f5788fe55df1aaabaaf9d2843b7ad15b8ae487e83501 SHA512 d4c733a3d33e0b3528b2fa38555f9318897900ec1a9e4ae35efdf0ffb0ab1af68059786dd9ab99d1d943310829887e8c01954c3c597a752e086a94d513b85e3b
+MISC metadata.xml 241 BLAKE2B c8e6466e0c122eda0f737f6830ba6fb7445c0ac7ca1524890b48e927ad302cfdcc7a0852b1d4bc444375dd4f77329345b4a49519833e5638e6a333d3c69015bc SHA512 34af1318b14f520d2aa49e93d44688e907657ffe1d3a6ba4e9f7fbbd00928b427266f836c0eb5efcccba86aaf1e4f49c3e48ab4bedc86334dd207a500a3edc3b
diff --git a/app-misc/wipe/metadata.xml b/app-misc/wipe/metadata.xml
index 8e517081e108..7d2a171e5caf 100644
--- a/app-misc/wipe/metadata.xml
+++ b/app-misc/wipe/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>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">wipe</remote-id>
 	</upstream>
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 1a7ebcb6a38b..65ab524a6866 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,9 +1,5 @@
-DIST yq-2.1.2.tar.gz 4704 BLAKE2B 980f0025ed397d620cf4883b3603411e7d969d641a50b6ad7f8be2ed9cb326772b0d79b36b0fe1c1f168e9b859bab63be3c0a6e267fef9ae15e8aa66574dbd67 SHA512 88f32e58aacd82deb06deee6910f5a145e54d20829f438cd47248d560119dd8112e0813ea8d55708664ac29ef011bbc3fd6b882e1c538ef44aaa9aa119584e99
-DIST yq-2.3.0.tar.gz 5165 BLAKE2B 5d317d78e4e9e0fbe3064c004b33cb267fe0947d011ea3f12b873a2a31b16695c57bd932b2f2e5145afa22f9cccb43bed0a34847c4975f83bf63651e6b3b5372 SHA512 f256d1766b697f6bcb88bb8129e587bb99929154e13167f179bff1669b08b5444af90d7a17382b4f434092110ddb9e578c1f374b56aba03b4a4406fc25b76d6a
-DIST yq-2.3.3.tar.gz 5486 BLAKE2B fa02b7466d54dbb5ddd4090329e1dd1d3826aa12d647563296236122fa34a85e7ee3e7f06edc227264db8fc18a215f39a5b171c18e498132bf701ef25def7936 SHA512 58461c74f907be241047197967ec316ea6ffe2accd99c8b97a158369d06f32c758c56edaeea30d3e4988e295a58fabeb47d960097b136c6b0bf16c2792b7f75d
 DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
-EBUILD yq-2.1.2.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
-EBUILD yq-2.3.0.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
-EBUILD yq-2.3.3.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
+DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66 SHA512 ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
 EBUILD yq-2.3.4.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
+EBUILD yq-2.7.1-r1.ebuild 1015 BLAKE2B cef0cd6d83941060e1b728b4c4e750558cce76ffefe731ddc1df99a9f3f7ffab7a80d8bed830abe3bff21964ad0b3425f08edf22a0edcb1a424ed3e2b5ebb376 SHA512 3c19aed68eb40ba60f64a060c25d8d6e783fddc79d6cea3524cd548d8a6140a6980631bc25aec1e529139c2037e63c6ffcbbb2eaf4dcaeaa0f0b1919aec7e673
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
deleted file mode 100644
index 1508219d3b3b..000000000000
--- a/app-misc/yq/yq-2.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.3.0.ebuild b/app-misc/yq/yq-2.3.0.ebuild
deleted file mode 100644
index ab7d35d6967b..000000000000
--- a/app-misc/yq/yq-2.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.3.3.ebuild b/app-misc/yq/yq-2.3.3.ebuild
deleted file mode 100644
index ab7d35d6967b..000000000000
--- a/app-misc/yq/yq-2.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..7b34b51cdb04
--- /dev/null
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+}
+
+python_test() {
+	./test/test.py || die "tests failed under ${EPYTHON}"
+}