gentoo resync : 18.08.2019

54 files changed, 380 insertions, 263 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 388418bc4340..0dbd729556e8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cfiles/Manifest b/app-misc/cfiles/Manifest
new file mode 100644
index 000000000000..f1d9dcab8c1d
--- /dev/null
+++ b/app-misc/cfiles/Manifest
@@ -0,0 +1,3 @@
+DIST cfiles-1.5.tar.gz 237333 BLAKE2B 26eaa9f6d96bbcf07047a0c7f5cc941bdf8417c53a766f2340a8109d8a9333da509840bc928588976bb9a8c416fd138798abd57053162024fcac20299b30cf6d SHA512 b13141ea128e4095d095474917091770cbc66a18178aee9369434beb8102d8102fc530823b40d4c44fa8f00e17e28de5626b55986f878a393c1b59fa2f491145
+EBUILD cfiles-1.5.ebuild 584 BLAKE2B 0a9c44e2665b8a67c3d61ba0a70fcf1cea5c8d15abaacd265aedcfcce6cfcf3813ecbbdcf53a393dc2898f5e97ae9cf34b228701cd9ef66d77c204425efb9de6 SHA512 62c4f4e6357788127a514e54b5f55cab373012beb69f836d343f0902e2efe194c75ead39a82d6490434a9e27ec33980f4cbc59d81dbf48e3c19d950cc84dc01c
+MISC metadata.xml 590 BLAKE2B 1aa0b35129da61cf18a1512af1ca77561b35608d72974aa4d82c99ed9b218443ae118f6f72a362409b4f9d3e34a0781333494724be6d8ca88fd59fe7980de711 SHA512 6bb1ae35d085057ff824fb1e0cf6922c9ff5e631e80814923e42d95c117a06c2d9f66511d1fafe4fbff72fe5fbf889b5a74378b6441bbf94ad9f944040bf7f3f
diff --git a/app-misc/cfiles/cfiles-1.5.ebuild b/app-misc/cfiles/cfiles-1.5.ebuild
new file mode 100644
index 000000000000..9c770c677606
--- /dev/null
+++ b/app-misc/cfiles/cfiles-1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A ncurses file manager written in C with vim like keybindings"
+HOMEPAGE="https://github.com/mananapr/cfiles"
+SRC_URI="https://github.com/mananapr/cfiles/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	sys-libs/ncurses:=
+	app-text/poppler[utils]
+"
+RDEPEND="${DEPEND}"
+
+src_install(){
+	dobin cfiles
+	dobin scripts/displayimg_uberzug
+	dobin scripts/clearimg_uberzug
+	dobin scripts/displayimg
+	doman cfiles.1
+}
diff --git a/app-misc/cfiles/metadata.xml b/app-misc/cfiles/metadata.xml
new file mode 100644
index 000000000000..732586efea37
--- /dev/null
+++ b/app-misc/cfiles/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>yumi.tanaka@miraclelinux.com</email>
+	<name>Yumi Tanaka</name>
+</maintainer>
+<maintainer type="person">
+	<email>alicef@gentoo.org</email>
+	<name>Alice Ferrazzi</name>
+</maintainer>
+<longdescription lang="en">
+cfiles is a terminal file manager with vim like keybindings, written in C using the ncurses library. It aims to provide an interface like ranger while being lightweight, fast and minimal.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/dnetc/Manifest b/app-misc/dnetc/Manifest
index 29bc98f12234..acc1261a3f24 100644
--- a/app-misc/dnetc/Manifest
+++ b/app-misc/dnetc/Manifest
@@ -7,5 +7,5 @@ DIST dnetc521-linux-arm64.tar.gz 629291 BLAKE2B 12554db6c175b828e9e74864955db7e6
 DIST dnetc521-linux-ppc-uclibc.tar.gz 718697 BLAKE2B 15f8438531b8074c8a56b86500c55b95eb33c62e4271023bab98601fadd3bc3d2afd1ae8562cadf8d724943515032c97a78084ddd12ef30c388456333ec60893 SHA512 31ad8999d262f0820275773f3387b0a9531ffaab662fa557cad504ed48d7e764d43ae198559b44ef9fe00a0a417e1780b327d2f1c4b7951ff760eb54393742e4
 DIST dnetc521-linux-x86-elf-uclibc.tar.gz 744639 BLAKE2B 71a317c724b91f17c1e67da63d5da2e04479572c6e8c9e9df16c9a0cf5f1d56622a7d20bd791f46b7baa3147fd18c60c312b16cc311bad2e609945620a843f16 SHA512 9178b0d42989302b82d8c62f978e819f5b30bd6acff60501e947038e655096bed3e3382015b50d53f0f3fa819be22ffbba21419a5175a01dbc449030387629fc
 EBUILD dnetc-2.9108.517.ebuild 2682 BLAKE2B cf6f8b44cebb407442779860387614e2ec2616ab8239e1abd30e82868820a93d9ed7887204451d5735af313f004716740cd71503de50d14aa94af66a3abb0c51 SHA512 7134f249034c68baaca4f2cc9987de67faa938c3cbdea5bd969d7ec98dec9404c775832445cbf6b1febec356c5ce08bd284100902abbccd821d6bc1fedd04f25
-EBUILD dnetc-2.9112.521.ebuild 2841 BLAKE2B 754543e36fa91647171a35ef3a0b005556ad0620dee6635b166e2b9021642ec161901acf7d482b83dc8129818ac85e17df71986719a42bcd8b43fc8cf2fc975b SHA512 6a51831dfb313642ae48171b398dcc3a85ad3d111f2a2e893ec901c14f40e55f798a5f3c1027d490267369f181f41e83537cbeba0ac696c6cd921c89e4dc117c
+EBUILD dnetc-2.9112.521.ebuild 2840 BLAKE2B e0796f250d8baeb9f1123456bac1d33803d77fa1ec376d4757988368f5436c30fed94d1500ea816fb829615b2e912f6840d734e4d49d8d914ffbe45407268f90 SHA512 7c4f4b03d3c1aa29afaf815448bbb6cf43a98123ba785c579531d8208b182191979c915b89343ac160187ad0d8a59438cc521729a58052af6ca7a0548da7ecb8
 MISC metadata.xml 357 BLAKE2B 10b84b6b4353d0dae2f48deae6622ca345c7723641b97ddd5e58e7ce7bbe438a065f3ac528a946bd99e089a45a8c2274417a51b05170d116a3fbd6e4bbb921a2 SHA512 6986582029e81ab7b8eec22c707c03c1996d0837ca9b4e7a0c31782be3f9c59a7d89c53980fdac00bb2a49555a774933704ac3fe390785840d072ac7ac9ac33d
diff --git a/app-misc/dnetc/dnetc-2.9112.521.ebuild b/app-misc/dnetc/dnetc-2.9112.521.ebuild
index 712ecc12ec4e..662d75cd8f54 100644
--- a/app-misc/dnetc/dnetc-2.9112.521.ebuild
+++ b/app-misc/dnetc/dnetc-2.9112.521.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI_amd64} ${SRC_URI_arm64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_U
 
 LICENSE="distributed.net GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86" # sparc not available for this version
+KEYWORDS="amd64 ~arm64 ~ppc ~x86" # sparc not available for this version
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-misc/evtest/Manifest b/app-misc/evtest/Manifest
index 505b72995e39..d17bb7b591e8 100644
--- a/app-misc/evtest/Manifest
+++ b/app-misc/evtest/Manifest
@@ -1,11 +1,5 @@
-AUX evtest-1.30-autoconf.patch 974 BLAKE2B 704e0b7114651ec950ccabf34206c10c6d6fc93e494b30dd1db2edc3cbcea4f8fa6cd601c5f61f9936927a98e1c915a53b5d463f6f0d03c2a71f04ed04ea9eae SHA512 7b4fc165bd5d9dccd34ad47bcab017da08e4efb47783925c75a68de4dde32a873018a19089b01e845ea55769d943b3eaddb962a2bd99fb1e62d4444c28c3630e
-AUX evtest-1.30-xml.patch 1362 BLAKE2B ac7f9c1e190b6292d2282ebea9f88ad5b6c5354b6d422a3f07e24d19b98229cf39a3f0f612c1f8e626551b4947bb334f82553f6e473d86a6f71b8e38a3a79959 SHA512 b558f97af8f14e7d316990f7657a7429b26b0df2d54a5adf849ee3237d1613e0d629f36f72963b31baa7fdf78db8bda0e687ff5925cb86a8afd0dbc4058b3c30
-DIST evtest-1.30-mans.tar.gz 2112 BLAKE2B 63981baf8c69993850d974f9bc94a9b96a45c3bb51379a6788e18715785475d8f3324134d5906b7188c950bf0d05fb138f4680e3a191cdfe6f13143eab44bd13 SHA512 470ac504091f9826023dd2cc62a1c0169f98bf2d6e9c4c3986e3719d67d02bb587023aa347a3fb26b0d06efae8eccdd05d88ae74556f3819416a6f6c905c4618
-DIST evtest-1.30.tar.gz 25556 BLAKE2B c396940af72faeb27143472cd62c3ada3016fea67184bdac2708a6d6347b07e4cc5a994b5c585263faa00d82003ed4f4859f51ed53a374e985389dc8102f8dff SHA512 ea995c37c0cf8dd8a4c493895bd039e4adac5056a06e9e0275e879ca1e774e98b5cf42bc77f1ad34225b15282cc4edb6dc088cb6fb16f82250bc35fb3975c4bf
-DIST evtest-1.31-mans.tar.gz 1661 BLAKE2B fc7763703299a7129e7332378df6190d42089776e9b2f88d1e9bd42592e2945313046e798862590869f7eb76e56136cec6d575ec9301d5cd9af44b810e13c676 SHA512 b3cd5cc8aaf6620a3243318ae42e807a8819a25082606707787ab8b1ac75f1f6dfc8b544d38a74b489d348981489153c33841ba0b0466ace3e3a83b031754321
-DIST evtest-1.31.tar.gz 17968 BLAKE2B 09ca1cfbac40f84d6715625a932839d8095caeae26b2dcfab73f66651d7d315381ccb92c50aa5b9b68f9495a4e48f2ce6d0fe2b7243b7ec91e4e4acee530e49b SHA512 1657d880c531c6c8407bf7a66ab159a5992c9ab70b840e600e91ad3a7429a07ec2c2f3bca6848614ebbad01a4a5993e43e4388705455f9d31f8b60b06c04a7c4
 DIST evtest-1.33.tar.gz 19736 BLAKE2B 1b36207f67fe7db12bbe8d8db119f1cd4a9adc34b839762b198c29044a36e6fe9e8275d68a27204de4d287d1f12bde43f3895003fba9403a443189fe289decb2 SHA512 e8d6b76a2256ca6085ec07a66af913873ec5bc196bea87bca4f9b3e8b3222b34fcf636572383df74940b9b5db4a07f3e0be3ffe1454c605520da0c56f38506c3
-EBUILD evtest-1.30.ebuild 1137 BLAKE2B e0dc80254b8be13b6cb5ac242b32f411ee34800119ccfc0df13f35b1ce24d7274fa372f646bcd7b62632bc617602069f9b754705a64da84e0f2c62da2f3474ab SHA512 43300763245c9d70a104185f20f38b70390d2a978d6fc9dfd7f5c10309c4869d61abc04b15c9452fd8281f612e0892262b767e335b61e4ecec672d270b791877
-EBUILD evtest-1.31.ebuild 1014 BLAKE2B 67bce706b3636e29a64a35901a11ec505a0f863cf07bea3d78aed0ace27b422b8c12de9532d4c9c3828e673224c3c8121646e36743b0313119bcbca7414159b7 SHA512 e6e3ae4b6cb3a246ca0c8953ddec187907b3300e535dce3255f1abbbcb9eaf965761cf11886e2acb5846d390073fe0661bd4af610f1ccec3d2be574335a027a8
-EBUILD evtest-1.33.ebuild 588 BLAKE2B a6d86a9b3294cde84e7c634792f9437a25dfee277f18fe0f998d2d3da0f8ceb7916dc70146db475194b9268ed4673a4b15150c3efa2fb0e3e43a81e484ab7e3e SHA512 ba02a762d4d12892a07085a85bf8a02240ddd3a431e9a6d90f95ac5aa14a0abb4af47daac90a34e169c1d7da361b51ba499fd8f51a3835b3762cd919eeaa28f5
+DIST evtest-1.34.tar.gz 19954 BLAKE2B 17ca600e89070d65f2bb95b468b921278ab63e50aa6042a974e8d4ac214b51355423c910bb0911e16a6bfc27e9fce59159719aae7d280679e7b292d02a2ee955 SHA512 5b4a18f13b86b1e2f5f723f6abb18c0a50d7f96b4412f46f503895c7ea8701a67a3237701de367c6b789533d8de887baa8f8f8e7e2fc4611235408ae21021b38
+EBUILD evtest-1.33.ebuild 582 BLAKE2B 5ced31a2fb4e2c827ab89f198c26f265144a910d04eae2afc11b7ad8b1f0509d434b51790db093867e8fc34cb15fc6a294e12090a0713c8c21000cd5833132c5 SHA512 7bcee32f3497b833ab86ebe0492b5d67e7b43604582d189276847b098e862ad53f4970b64a2918e89bde08c37057f996b2edd46cc8a9d9ec3fc16349a49b5832
+EBUILD evtest-1.34.ebuild 584 BLAKE2B 15efc1c03e763ca1de6f10943f81bf6687b8bd0051b4747b658470353a572dd015a052f46756b802bb0380c9386118e1c74d6b3cfa9663a678b042a1677df38e SHA512 94975b0c5a62d5b265c20048071757e61dca3b97ffd1bca7bce1ac1bd74635572716aaffadcc8abe7f628aa2b6126d9dc5d1266f59ef43cc904e7293f8251d06
 MISC metadata.xml 241 BLAKE2B 25bcd095e850e5d5b0eb543070c829aa274b10aa3c44b1e21b5101a57f2cb66585a033aa9f93a8d4f278daa208b3ced7cd2d4f726cfb43cbe2e141c7915ba1c2 SHA512 7f368e04c0170689ed48a96f0a5dfade1ad0503dbf28eef73067d9c5181e760d94bd36c4f5558cab4bf244b25aa9d2311bef409d02ba4d186d83353552ec1a75
diff --git a/app-misc/evtest/evtest-1.30.ebuild b/app-misc/evtest/evtest-1.30.ebuild
deleted file mode 100644
index cbc2f0a66a97..000000000000
--- a/app-misc/evtest/evtest-1.30.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="test program for capturing input device events"
-HOMEPAGE="https://cgit.freedesktop.org/evtest/"
-SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz
-	mirror://gentoo/${P}-mans.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="+xml"
-
-# We bundled the man pages ourselves to avoid xmlto/asciidoc.
-# We need libxml2 for the capture tool.  While at runtime,
-# we have a file that can be used with xsltproc, we don't
-# directly need it ourselves, so don't depend on libxslt.
-# tar zcf ${P}-mans.tar.gz *.1 --transform=s:^:evtest-${P}/:
-RDEPEND="xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.30-autoconf.patch
-	epatch "${FILESDIR}"/${PN}-1.30-xml.patch
-	eautoreconf
-}
-
-src_configure() {
-	# We pre-compile the man pages.
-	XMLTO=/bin/true ASCIIDOC=/bin/true \
-	econf $(use_enable xml)
-}
diff --git a/app-misc/evtest/evtest-1.31.ebuild b/app-misc/evtest/evtest-1.31.ebuild
deleted file mode 100644
index 74195303d4bd..000000000000
--- a/app-misc/evtest/evtest-1.31.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="test program for capturing input device events"
-HOMEPAGE="https://cgit.freedesktop.org/evtest/"
-SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz
-	mirror://gentoo/${P}-mans.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-# We bundled the man pages ourselves to avoid xmlto/asciidoc.
-# We need libxml2 for the capture tool.  While at runtime,
-# we have a file that can be used with xsltproc, we don't
-# directly need it ourselves, so don't depend on libxslt.
-# tar zcf ${P}-mans.tar.gz *.1 --transform=s:^:evtest-${P}/:
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# We pre-compile the man pages.
-	XMLTO=$(type -P true) ASCIIDOC=$(type -P true) \
-	econf
-}
diff --git a/app-misc/evtest/evtest-1.33.ebuild b/app-misc/evtest/evtest-1.33.ebuild
index 232489f49621..e282a07359ae 100644
--- a/app-misc/evtest/evtest-1.33.ebuild
+++ b/app-misc/evtest/evtest-1.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-misc/evtest/evtest-1.34.ebuild b/app-misc/evtest/evtest-1.34.ebuild
new file mode 100644
index 000000000000..f3cc4c44480b
--- /dev/null
+++ b/app-misc/evtest/evtest-1.34.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="test program for capturing input device events"
+HOMEPAGE="https://cgit.freedesktop.org/evtest/"
+SRC_URI="https://cgit.freedesktop.org/evtest/snapshot/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="app-text/asciidoc
+	app-text/xmlto"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-misc/evtest/files/evtest-1.30-autoconf.patch b/app-misc/evtest/files/evtest-1.30-autoconf.patch
deleted file mode 100644
index 940c1316fd6f..000000000000
--- a/app-misc/evtest/files/evtest-1.30-autoconf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d3864018ef09ef38e1733110e2643735067bc02f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 6 Jan 2013 14:49:40 -0500
-Subject: [PATCH] use newer config headers macro
-
-With newer automake, it throws an error:
-configure.ac:5: error: 'AM_CONFIG_HEADER': this macro is obsolete.
-    You should use the 'AC_CONFIG_HEADERS' macro instead.
-
-The newer macro has been around a long time, so there's no need to
-worry about backwards compat here.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ebf657f..9980c5a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
- AC_INIT(evtest,[1.30], [https://bugzilla.freedesktop.org/enter_bug.cgi?product=evtest], evtest)
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_PROG_CC
- AC_PROG_INSTALL
- 
--- 
-1.8.0.2
-
diff --git a/app-misc/evtest/files/evtest-1.30-xml.patch b/app-misc/evtest/files/evtest-1.30-xml.patch
deleted file mode 100644
index 1fe3e6c7c34b..000000000000
--- a/app-misc/evtest/files/evtest-1.30-xml.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 92ecfec7b0a9c1f8d952d20e8a0cde5930f9264f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 6 Jan 2013 15:09:26 -0500
-Subject: [PATCH] add a configure flag to control xml behavior
-
-The default behavior (autodetection) is unchanged.
-This adds a knob for distros to control directly.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9980c5a..e973733 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,11 +5,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AC_CONFIG_HEADERS(config.h)
- AC_PROG_CC
- AC_PROG_INSTALL
-+PKG_PROG_PKG_CONFIG
- 
--PKG_CHECK_MODULES(XML, libxml-2.0, [HAVE_LIBXML=yes], [HAVE_LIBXML=no])
--if test x$HAVE_LIBXML = "xno"; then
--    AC_MSG_WARN([libxml headers not available. Cannot build evtest-capture.])
--fi
-+AC_ARG_ENABLE([xml], [AS_HELP_STRING([--disable-xml], [Disable support for xml (evtest-capture)])])
-+AS_IF([test "x$enable_xml" != "xno"], [
-+	PKG_CHECK_MODULES(XML, libxml-2.0, [HAVE_LIBXML=yes], [HAVE_LIBXML=no])
-+	AS_IF([test "x$enable_xml$HAVE_LIBXML" = "xyesno"], [
-+		AC_MSG_ERROR([libxml headers not available. Cannot build evtest-capture.])
-+	])
-+])
- AM_CONDITIONAL(HAVE_LIBXML, [test "x$HAVE_LIBXML" = "xyes"])
- 
- AC_PATH_PROG(XSLTPROC, [xsltproc])
--- 
-1.8.0.2
-
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
index 45c56cc322f2..7103a96f7ea5 100644
--- a/app-misc/gcalcli/Manifest
+++ b/app-misc/gcalcli/Manifest
@@ -5,7 +5,7 @@ DIST gcalcli-3.4.0.tar.gz 1675456 BLAKE2B 38ac6eed8e03f806fa2311389c4fc3377ae16e
 DIST gcalcli-4.0.0_alpha3.tar.gz 1675261 BLAKE2B 8388e489abd21a916568c9a39e1b41875613656ff60fbf6b555bf22408619e940512405c89615eb9477a20c5443e5d7d1c714905df86da4d76d1eede033daf01 SHA512 215860f50d2b32b94124537b3d8dbaebd7af5b9c907d565a58eab5357efa8a8c8bc6c20264811337ddbc33ae75029bf59c782e1dbb317667084f11da8c41ea18
 EBUILD gcalcli-3.2.ebuild 815 BLAKE2B c8e990365032205d0e6665747a8d56eaab422db3c0e7e92bc9b3b17e40de7443dd980e344e042d6e4a2dd09b9d8a52f4c3a08ac941397b10ad19e3aa2c3d45fd SHA512 992baf956a14895ec81a378bb55958c8d1b5beee8b0265cc37456dd39d18d66968a450082820832c5b04c6964c6e28e3d4bfe25973540786ea2693c49c3d30d3
 EBUILD gcalcli-3.3.2.ebuild 815 BLAKE2B c8e990365032205d0e6665747a8d56eaab422db3c0e7e92bc9b3b17e40de7443dd980e344e042d6e4a2dd09b9d8a52f4c3a08ac941397b10ad19e3aa2c3d45fd SHA512 992baf956a14895ec81a378bb55958c8d1b5beee8b0265cc37456dd39d18d66968a450082820832c5b04c6964c6e28e3d4bfe25973540786ea2693c49c3d30d3
-EBUILD gcalcli-3.4.0.ebuild 922 BLAKE2B 3a16e34f4a14caf8c65051cc6c5a4bbb8a4afa7c1b4f30a1dd8b1ca629043ab9d84f283c5717f07bc622697035db79f379732918bcd8bce93a4035a61fd7a6ff SHA512 578c55f37ca24694410fca8875b7523c5f84b375408f44afc84254d2074df7c0033243ff127765b3673acb5a4a1aadae88f819e1fb9317c338ffb68eee8e55b7
+EBUILD gcalcli-3.4.0.ebuild 957 BLAKE2B e711b0dfcf53ea457cd43946e2808ace36afb7806f8eae00ca556450f6ba3542ed6c7ccbaf0b1ab3626d49605dcbf36bb36a8fde44e80774a35a1d357e82d052 SHA512 105df2dfa0d1962616c650d05c901b2b8d6f63d2b799eb5f1a08fb062f7555e5c0f67b150cba95a2cfbc473fbe7b0b182054165a94a5042e1cc74275c45298b2
 EBUILD gcalcli-4.0.0_alpha3-r1.ebuild 993 BLAKE2B b1fac1d55ca70ae50d96943ceec2ccbb181fcb75e614a2a1f415f78f4bf602f3caf34427b5fa38f0b53cceae60595a8b2fb04aa9f51e639d1563941b5e9abd14 SHA512 cf6d503c7879b0b434aaed44743ee99be5af8f48009f92c5a44677fcf8add533307c93741eacca5687220a2295f8547834f59741e4aaebb319fcb5a521c8523f
 EBUILD gcalcli-4.0.0_alpha3.ebuild 872 BLAKE2B 82a8e8d765daff00c0b05adf161acecd6584a43918721c9048fb7f6c54a49bee8c8b2f34b46a7296b7d6640a65e26e78c4e45085b3bd9c774c932acb381b5b7b SHA512 7b46807216c42f4129908bc96f71d365f97dfe06e1b95a3124b2812943e6c55423b25cd2543e3ebdbcb67b9c2c6f8ee0a9d8f446c8fb226adddd1ee0ac50c2de
 MISC metadata.xml 340 BLAKE2B 206e5c230d6379249a0cd6e99bc41cd3246cd37dd3766be939b5fea135664b63e9cf1aa92e24f035be65f0553f7f7cfbc8a460391f52119aa1f052399c05ea33 SHA512 4d2abd6d07db32d501923eef6b9aa7752b844745a0511a36801480833dd205adef443bea80efa86d270cdd6d0edda16a9989d678221d0b480366a47a7c76de02
diff --git a/app-misc/gcalcli/gcalcli-3.4.0.ebuild b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
index 43c611febff7..d7933f2763b5 100644
--- a/app-misc/gcalcli/gcalcli-3.4.0.ebuild
+++ b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index c7a76b42b3de..1961d5690bfe 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -3,5 +3,5 @@ AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18a
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9
 EBUILD geoclue-2.4.13.ebuild 1676 BLAKE2B f4cddd032f3d5f3503e9e1e729faca949544f7a094cd9ff2d52b1bfc47a90cc85116b6cd5a590851a7ed31afbb29dccf5733bc58288616d10f69db90a058d1d7 SHA512 902a1922ce0ad6c3e9ebd0bd1d034605de6652c8d9ac40271d6593f5cf9af2db8c41a3901e31d5d56f2857446126fd46fc0fb06fc04d644221d6afce46dd3d97
-EBUILD geoclue-2.5.3-r2.ebuild 1760 BLAKE2B eb321054f2f9bfc0e75a1b9dd6fe62d813883711c5d27e22184a58c54dc2ec14ee74f44f8514e6cae053183a13843f587fd92e3283aa6027d940164b9971028d SHA512 09845c4e258a94a3a4cd28eddd8a95a2c56d38a53001a14453fec3677c81bc624296b1b7c0f688a1538bde292ece070f249a96b0832c38c8c7eb483a3de1c56b
+EBUILD geoclue-2.5.3-r2.ebuild 1755 BLAKE2B 7868a135d6b2f3b3ab149f74e4918f0da7f35820d3b459d7a52858dba47eea1e06d053a8eb449c0f2333eca49413ae5a0f38db58b12b6283162ababb589775c4 SHA512 39c9b0aba1448960974ead1fcb7a0e9d9cc817f73b37c14b7791eb441f7978e8ed186fbd5197d039c8605b4abe059cb985c039743ad4087f9c6d97e5b729a629
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
index 73bd1075be74..b10173ef1748 100644
--- a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
index 4f544960eee0..cefe62e3a6b4 100644
--- a/app-misc/glcdprocdriver/Manifest
+++ b/app-misc/glcdprocdriver/Manifest
@@ -1,5 +1,5 @@
 DIST GLCDprocDriver-0.1.2.tar.gz 21438 BLAKE2B a480d241ad1f7b88ef63a0d2934d59325a9d5739497313c8bcc3f720a071d5bf2804986715e4392fc4713fc3641ae23e5f54cb81cdf1d45db9397d985555260a SHA512 b39dc9d68225bde63a053f124260cec9a081da1d2df6d245be109c8017d60e0e495f056fbc7ee077633d3ac68aaf7cdbaf606e1726f383aa583775a75eea5433
 DIST glcdprocdriver-0.0.6.tar.bz2 17209 BLAKE2B 631918337227c43eac163d7353182852500c08db0d1d0f3d4145d9b57895a66eb8c47a16715c1c0e4c3ab044a0de5ed80c282fd57850cbb33636cf775b721a4f SHA512 c489b6e6d6a72306867adb94ed6a6cf6354c834a27fd2ab2ac733707954b18bf93dc56a868e167fcb183602c03ac648bb941699760817e414ab8e8592edb8b7e
 EBUILD glcdprocdriver-0.0.6.ebuild 745 BLAKE2B 770037eff2b660262de1969140ca7ed5f5ca6bf6f0c2ec4682a7d211839347e07c626939f05c7103d58ea9b821297ece5b2ffad90f5651c19ad7ac5833c239be SHA512 3a7a28e045eafddbfc97b935454a557ead15aed88f1b6d2f9eed50f1fc1655c28a59b9bc810257a3de5eb32086e823e5821278c60672ab80b3a6caa263c81a65
-EBUILD glcdprocdriver-0.1.2.ebuild 785 BLAKE2B 49dde053eaaf6f2d0ebaca1c086a2b5e046e737febc9512c25494a5626da3c25795380614ca6693f200d76bdb54f1e1c01f200185775c476852093b2b631ba66 SHA512 1540ac1fb89772d7905d241ffc85a8c80d0880ab0b919353bf742acb6823dabf671c2edb1c5d25a475ce62b7da7bf5d734217eff306a6d63a6c20eeafe458ab7
+EBUILD glcdprocdriver-0.1.2.ebuild 783 BLAKE2B 5039121c747543732a54f633cf8f39d1e5a54581139ec067cd4c855957a3f75da4893ecfdf2e7e0fbe4ad1b554be4c325e02e46bcfdc5eda4ff5d0d30ffb7bd5 SHA512 ca342560344e98a407a37564adf4bd8d0aff3c66343af04caebb7f29764a0d28fde97076de63a0f3429a7e3e957c8468e8dbbb4df85738e72896288de18b6c33
 MISC metadata.xml 1089 BLAKE2B c8d3e6cecf76a95e23b73b2411e68c0ad7174ce1dd497c50df74a7747bf6cc38267870522ba8eba50021f04c46365193516619f9b36aa6bab6b5fe6adc739241 SHA512 7d628191af503365b442deeb69fda18b451d34e87c903addec0cbdfc86c767522f11bfbd56ffa602c15cceb6355ab5844fba3390e5388cf333f5a458273efa4e
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
index 3a914692acec..baabf0037baf 100644
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
@@ -9,11 +9,13 @@ MY_P="${MY_PN}-${PV}"
 inherit toolchain-funcs
 
 DESCRIPTION="A glue between the graphlcd-base library from the GraphLCD project"
-HOMEPAGE="https://lucianm.github.io/GLCDprocDriver
-	https://github.com/lucianm/GLCDprocDriver"
+HOMEPAGE="
+	https://lucianm.github.io/GLCDprocDriver
+	https://github.com/lucianm/GLCDprocDriver
+"
 SRC_URI="https://github.com/lucianm/${MY_PN}/archive/0.1.2.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 65e5316ca9d4..ded005dd92c0 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,6 +1,8 @@
 AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
+DIST gramps-5.0.2.tar.gz 16706686 BLAKE2B 006c8d10d574d7fe92b661400c257f6f1bc2b2e9e27d788ca761a5d51aa8593f9d26fdccdeeb0fb2860bfe1b08d937e938b3fb21094a42de0fb306d3c16dca49 SHA512 abbf885189bedcf9897bcb3216df86af41498c94b3b9c133350e84a8a61057ab4ed4823c3923823ec99fe0be92648e9259fdceaafd31f968c7d1560a0cd859da
 EBUILD gramps-4.2.8.ebuild 1601 BLAKE2B 45868269d9ba22e5a62f44cf3e87be2e50c1cababffed858e27fb828cb7c1ed4fe54cd955932ffe24921672e68d7ac67cdbbf6dc212dceaff88b779b19b390d7 SHA512 751c5b2fc03b4b890531d756ff8f3c09cf33eb63eb56c0af80412f58abb5f84f4d9a0ebabed06f50828665aaa19f47e8bae081436a9e02603486615f689a6ddf
 EBUILD gramps-5.0.1.ebuild 1990 BLAKE2B 8012d40f4b7a242b1b7bb925182806af27551f537c495e2da48f6b79af71948260719e2ea9bec01aeb62d499e57938fab418c0d2929b2a25a091b1b934132ca2 SHA512 278b9b856616bb6df57807ccdfb7c89d801ac8d0f4b5e8c8cae5d6aff29ad6ab0a2ac4d8bf9f46142a0af5a8bd3ff4f3c01d8303898643f279dab34a8484fc04
+EBUILD gramps-5.0.2.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-5.0.2.ebuild b/app-misc/gramps/gramps-5.0.2.ebuild
new file mode 100644
index 000000000000..3ce0f03cb286
--- /dev/null
+++ b/app-misc/gramps/gramps-5.0.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	dev-python/pyicu[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index a90bac703bb3..3f4292b3cd68 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -3,5 +3,5 @@ AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45e
 DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9
-EBUILD graphlcd-base-1.0.2.ebuild 2168 BLAKE2B b014efa367280308ed4ee6012e0d0c1fa59389744ff5142caa7ed2ba73837b0f549750532e903f429f3357de980234613cbca0e1ec3bf0ab431bd736221133f3 SHA512 36df96a9274a58c1be0ff884b4ef9d8724959403e22af6f351f548171b1fe85a5e13228956643d73860af61a1e17d166570e8418dad339e0319befe475377137
+EBUILD graphlcd-base-1.0.2.ebuild 2164 BLAKE2B 6b4ae541c0947ff0d77864c57a7be8c2359c991b051451f8a79600c8c1f95547a84d0c90b1bf14984d779b0abd062c2e4f8dc790a4f54aedc650b6101acf1211 SHA512 c38c31b8c6a6e9653273b7803e3bd5ba393893d45d7b152052dceb38c90f7273ec82728d5c47343e6fdbfe68f540a635bed4c466021c00275289b9072be90287
 MISC metadata.xml 1077 BLAKE2B e0356b1628b9485ac746483a17cd3f8b026001676c605751f0a14b476a6f0ec37937cda4c8f6d7f4a627f7a23a68d5f5002714af5cbdfca8fa6c8ccfa43aae74 SHA512 f087452936369496699927c86029277c90cdb95504c637b118042c90726ac54b2518eab963c16b6a3deffa11ee7dcbcd2900f72af0d8a39dc0f261a4e5121fd4
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
index ed6379c3013a..9c5ac5cb28c7 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
 SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
@@ -27,6 +27,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
+
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( "HISTORY" "README" "TODO" "docs/." )
diff --git a/app-misc/hello/Manifest b/app-misc/hello/Manifest
index 6dc363b178ac..fafd38d9f843 100644
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@@ -1,3 +1,3 @@
 DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadfc2b291e2fe3612e73f7eca48b3b63032c883f11a8a5764c757625c4a736904d756d451ad0516578040290f SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de
 EBUILD hello-2.10.ebuild 475 BLAKE2B 61041ddbbf448073cebbaadc8aeb57e2bfba978dc041719a5d4faf9a32f6f68db6e75d1598eacbb8a3838c064f3cdd11462802644a2e2dd7c6b91bf5d4a1cb8f SHA512 2c70757973aebaad59ae5dd1648ddbdda55d1f39567f123fb53fe4a1f1e9f383c3db4aba6537704fe799565c795d60dd32a74d52457f556ecad44779e36c6013
-MISC metadata.xml 247 BLAKE2B 0d7d70e4b64584cfb5104e6f272db8f23e13147f254d8b5c74169b41ffaa33168d3f1b5335792db250ef06758b50220909c21fe336a76c7437662f6a28bfeec1 SHA512 81c81f4438f7102cb9da6c1b43daaae38dd1b111ef072465fa7e8eaba449705fa878f580e9f29dc0f28b77b77d1d9e1e40101f5c88d117727776b21ad62dd1a4
+MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/app-misc/hello/metadata.xml b/app-misc/hello/metadata.xml
index fa5200558136..58f638b2ac3e 100644
--- a/app-misc/hello/metadata.xml
+++ b/app-misc/hello/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>jcallen@gentoo.org</email>
-  <name>Jonathan Callen</name>
-</maintainer>
+	<!--maintainer-needed-->
 </pkgmetadata>
diff --git a/app-misc/mkcert/Manifest b/app-misc/mkcert/Manifest
index 912bcc627763..6b29a3275fb9 100644
--- a/app-misc/mkcert/Manifest
+++ b/app-misc/mkcert/Manifest
@@ -1,3 +1,5 @@
 DIST mkcert-1.1.2.tar.gz 374244 BLAKE2B 3d9dd700e77ae6eae693bed51ae027fba409880f2c0f8fe1d5eb3c4af1e85f03784c0f6b55a384117c8ba8949ba0f061911998846f8c7ac3fddaa9e4dee567f5 SHA512 6015964915088914c0c208c47a41142b4b69e1e0c6e890422fe07c0dee2fb7c8a1ac04b9efba8a913de35ef3f46d3c8ee96941257eefbceb1c1885a67e1255da
+DIST mkcert-1.4.0.tar.gz 375857 BLAKE2B 40d8f7a421ca4dc5d6c9c3fd6ec2a2d5a742c1f0d3a7a336270b44847e9d0188cfb34b918332902213d71ef3251a65dcd1636d641609a2f898f449298d031dfc SHA512 4a31012262813ad6f34f129615e11580084e5da74ccecd043dc47b1ebb7b13fd2f6594bdb4e05a5d1a680d89ad62c2a4b0662c5fd029c154bf9e9e0981de7d33
 EBUILD mkcert-1.1.2.ebuild 638 BLAKE2B 63edba0e65ce29bcd23e26be4d4573208d1ed457966338d663587800c583b4f60daaf823fece40397781060e2c5fe6d08d0be907fe2eea5a7201b1af7364482f SHA512 ea148834a727dee96adf0c7b863ed220bd5b3559761c552b004e8db35ec5c72f3ae77ba9beee63b35e637e781cb1b8ac401ad8df6cec58e2f4b6b9879625844a
+EBUILD mkcert-1.4.0.ebuild 635 BLAKE2B 8f7443127996609fe967de423b144fdfe964fecb9ae0c4b07749fe1cc9e5dce94b3ae876cd13086ac06961ffd596f7af7c54b086d288ff84ddb41bcfbfafd7e4 SHA512 b66d28b3bff5f902a370b22dff4eaabf12d62013b6dc151b50333a1135e8e61984ea1cb42d2f54221ad2fe3829148d1f5f2fbab1bac449bda7f7e7d9bc4478f0
 MISC metadata.xml 250 BLAKE2B b66a738607cc4fc7299cb2075c67ac40558a890c57e9c28539c4eeeebf1edf12288414babb7340a5464fe87ba325d7665a37ec2aadb81934a41f16b467db96aa SHA512 c2fa249b463e4116ba228c35128bdb3d4b8490678cc9e240074bcf4d3569b54edbb67cdb27da45535f2e23bfe4d35607fbc16887e97af285cfd2b1f994fe95ac
diff --git a/app-misc/mkcert/mkcert-1.4.0.ebuild b/app-misc/mkcert/mkcert-1.4.0.ebuild
new file mode 100644
index 000000000000..834a1dd46f17
--- /dev/null
+++ b/app-misc/mkcert/mkcert-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/FiloSottile/mkcert"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A zero-config tool to make locally trusted development certificates"
+HOMEPAGE="https://github.com/FiloSottile/mkcert"
+SRC_URI="https://github.com/FiloSottile/mkcert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v ${EGO_PN} || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/mkcert
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 0f4f1fbd2658..8ccb3473df2a 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -5,6 +5,7 @@ DIST nnn-2.2.tar.gz 50955 BLAKE2B 010b68c20e7ce4ccc8df65192d7be0a76cb5a84973093d
 DIST nnn-2.3.tar.gz 56286 BLAKE2B cc1d79ccf467ba47fc4b50f335e7f2a9b1962555afacc4996c986c9b962950c1f645ce9b0f0e7555a842f429dfc80a24522613d5f447c5edff13111baa57df02 SHA512 416eb08a40534ff4b92b8757c75d8e599d2ea1cbfe7cdedaccac42fd819b1f15e3da839181b232036b1d63dd8bf7c82df801cb4c456e8917fbe47a9a25fae361
 DIST nnn-2.4.tar.gz 62510 BLAKE2B 40a445bcf840afd4dcd5c4e94d1ca3af9aad6a8b8c801d97420a4f5f237bbc41cc7157bc43cd3c9ce83b04af3dbd7c6ecf467cf690922cfe36cfeff5f87ef365 SHA512 b285b14bb73e81a8480b19be7adf0b6efebc632cae82cddf9f040e644dd07dfef4e5c27df2e318aaa21eb1ac4d9e20b6d89f66b8e9b481160bc49f1302806722
 DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb540807fb15eb1a9b468181783fc9db56b69105d0825f640d203a6615c4c804f4b45fbc30b854eecd146fcf SHA512 eb50b5368811a9b93caa385a94b2e6a63705bd0ba1db4dc9a3a628a42d11547d53095736e4afa6f73037064b2ef883fe9a60cb048279ba0dd9889503de7e5167
+DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249b0b56257a6657b454bb03b73ae374a72f854c73bb423e4b39135de277e1785d480590ebe3b812b3a6b SHA512 dbb445d5f3bd64640c053d04cab7c7c6aa82034c4715236129b6079c69db57c870cf255d454aeb224c85ac9d52835999403285f1d4a4c72ea8a3d439a4e9e1eb
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -12,4 +13,5 @@ EBUILD nnn-2.2.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f
 EBUILD nnn-2.3.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.4.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.5.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
+EBUILD nnn-2.6.ebuild 850 BLAKE2B 7b6263289c1dc43792eb29dc73fedeac07b4e588f1bf859db76865d07a485b57a873630dd2808c3f4185b09de196da72cde083b1a55f1992529c8aa158a04158 SHA512 52ab6fb05dc13ea1379cc75319e2fe7ca35554bb9dd0136305ac7dc3eb2c5a446563bdb054a79838601c169e3b3fc0f46b52b965d7ca5e3e82c355e36e59ed02
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.6.ebuild b/app-misc/nnn/nnn-2.6.ebuild
new file mode 100644
index 000000000000..469c9e951d71
--- /dev/null
+++ b/app-misc/nnn/nnn-2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
index 21c53c1b5d62..244ab0ae8295 100644
--- a/app-misc/notary/Manifest
+++ b/app-misc/notary/Manifest
@@ -3,5 +3,5 @@ AUX notary-server.initd 568 BLAKE2B a38ceeadc4d3bd663dced340da3040b352081dce6d27
 AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d99883496a9622fd04c19d097a498195c9e37246420f4f01fef07219bd4c9e76dc26cf8b70d9ce43ab1c7 SHA512 088bbd2eabf1e9be673b35a4a481c270ba2ccea479ef1164804ecead730a61465862888e7cbff53976056826d4ff066e1e2ab253cd6e3287109d03873c11777b
 AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2
 DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3
-EBUILD notary-0.6.1-r1.ebuild 1654 BLAKE2B e3d50255904169cd8c1bcc4142464a8c4eea30522e58be5fb38b7a90944a2cf72620e39d4600e8a9bdca8a96a276ce632ee812a67fb3edc1ab80d59681599a2f SHA512 bb6b3601e91bc912d0ca062832fdf067dd40eef167e102577fe4bafd560de76e4839cef92f0d207e1480a9e28c441165fad5f68157b588738c24dbf0af42f9b7
+EBUILD notary-0.6.1-r1.ebuild 1645 BLAKE2B 5abcaff1cc0c1b032f81c1323c6b1df602b5882cda7dca4d19d9aca7e3ed2b7a3260d254b89a0cdf6b10b7c5dcd40a079fe0ec898a818d6c2aa4e218b6dd0e0a SHA512 83cd343051ac05b4be4443cf8a41356c89d543710e8efe580e4e260370be8cd3d4ea4e554d47b16a1521609d2bc529cbbd3bedde6435dd4bea197014f1a9f77f
 MISC metadata.xml 262 BLAKE2B 597c3ea2ec2e6106554e720aff9b70c04b0651ebf448d86468b07eef6e07112c3b66cb38296f0eb467e0442b81fcb0e72fc1ad0dcbef949cda8bf400db947649 SHA512 c7d1d7c1af64b0ed60d30a70bea37c9c60030744273c21aef968e5655cc118bcf3a43d3590ea0e162f4c97568c7483e3e86ce59de3673e451e66e62b177e060d
diff --git a/app-misc/notary/notary-0.6.1-r1.ebuild b/app-misc/notary/notary-0.6.1-r1.ebuild
index 00221646040f..5def4a774c57 100644
--- a/app-misc/notary/notary-0.6.1-r1.ebuild
+++ b/app-misc/notary/notary-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,11 +24,11 @@ pkg_setup() {
 src_compile() {
 	pushd src/${EGO_PN} || die
 	GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
-    ${EGO_PN}/cmd/notary-server || die
+		${EGO_PN}/cmd/notary-server || die
 	GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
-    ${EGO_PN}/cmd/notary-signer || die
+		${EGO_PN}/cmd/notary-signer || die
 	GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
-    ${EGO_PN}/cmd/notary || die
+		${EGO_PN}/cmd/notary || die
 	popd || die
 }
 
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 2352b5d782d2..323cfc441f2b 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -3,5 +3,5 @@ DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c70
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
 EBUILD pax-utils-1.2.3-r3.ebuild 1810 BLAKE2B 49f27dbff6e2ca12b14e53aeec345345a8b0e775862fd963a4bb429104bdaa208d7e38c5d658783cff4f8c4cdbb375d9b0f576e64900ee30c77039743f8fbd4b SHA512 e1e76fe68464cbdef0e2627dc2c947251ec48c6302481b6ece21c42c1819e819f764ff9f5512286d75fe0d630c45cfabe19fde87e039f68e73ff8f651a773734
 EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
-EBUILD pax-utils-1.2.4.ebuild 1767 BLAKE2B 217aa0a3679d30dfb75e815c7b157163dc7a189a646775bf3a45b4bdde3e898c63fe3e3f0c486bedb0fcedc23db07e0fb00f7430481ccdb40e0f8f0b404c797c SHA512 97506e75d1e82dd92eabedca2c082f9d79a412cfacdf71f1535172078aa46ed136017d8c0e627966bc3f3cfc13109ef287b892a83be6c6b4b70fc287bca62b46
+EBUILD pax-utils-1.2.4.ebuild 1769 BLAKE2B 8c1bc1db322924b228ea5c1eb4862cbdcfdd2d8d2efe0ce9f1a42a64367e6e56f2cf7eb754a34db9e205b0f01aada53887511502157d772c1dc8c78971769f63 SHA512 cfe892a2cc57cc2b89a22cefacbf033a824151ce64b639f8b841c8fee97e8b223689186e9f6a6737d8e24b59eeb7637916f20edf2a03e1afe62d8567469d8a5f
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.4.ebuild b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
index 5650266c601e..52908fc467fa 100644
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index 893a7cf40092..93093270c61e 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -24,5 +24,5 @@ DIST github.com-xanzy-go-gitlab-26ea551e8c159cea42a9f206bc18ae5884d44d0c.tar.gz
 DIST pet-0.3.0.tar.gz 2735876 BLAKE2B c2b629db202c263b7419e79e15e07b808ea2a395030ef79214c541ac0d17a9fbe9cf3db9bc7e1a886da38ff8becd06d18abc24a69131cf6e3009ee2d72b1e6db SHA512 deb0323fbcd0195df9638bd82077a55be6554d80c44ddbb08cbb63c2a055659f5aa42fd87bc498d5cb0c93d57047f48462ec428ebff3d89a80dcd4b3661447fc
 DIST pet-0.3.2.tar.gz 2737547 BLAKE2B dff3c20539e910a06840fda95cae9214f4e846d503454c3d98a46dd0756dc709d7055f52b58dce057b4513470a19ce4542c3b2af35f4492dc544366a44e6f311 SHA512 b8abef80a7dd52b0143638dc12686f519b76b326c0cfb487423011e54fe536a83f9994c238854e42652138ea4b0ed1dfb37c59af37e329424c01186da74ed910
 EBUILD pet-0.3.0.ebuild 2169 BLAKE2B c82ef596b6abfb64733fafce4a3538c0ee825f102b092b267592aeed9369171c73a0f5cad9e9f71ec4dc4069a5754f330824e788dbc27e756912d0f585a3440b SHA512 ea6141990ccd11c3498ae71f71d398c7f46c05a44cf9b9961781cf9e1ecc2a9e29af9a5c07eeda69fa7b6c3619b5f280a35eefc12e920ff17733d3b991c1e5a1
-EBUILD pet-0.3.2.ebuild 2246 BLAKE2B 34d599689333ca5b18ea63f7102458bbe0e96c49e19ef2c95ecc8df73679885655eb39fbd51ce38d1afbb09917ca2525bc6d7528d62bba96cb6c5b2a16a40aa4 SHA512 07624be075768813d61361fe639dfb22be9e981e5a476a0c2936398d85d44f0baaeb71b22b47af463d05c2730db30957d6ffd7a374f514099a8fd85fce7c3912
+EBUILD pet-0.3.2.ebuild 2242 BLAKE2B ed3711b15f86095a1b2dfb8f3e840cd41fd7609a1cf04380c72dd795261c5648c8be9a7c29c3d84026422ba94a45490a0d5c25e6f2ec07f024846365b235832f SHA512 6d107b19178ecb701f07a790cbb58bcdad76f07ffd9ef7b877634f0594ebefd327ace538bf21bb4c825bfcc88108797a36a356d9af6babcdd45ae0ba3fab4de4
 MISC metadata.xml 769 BLAKE2B 299b0963eaefbf40ffeb93e18f23089ebabdfe4249d085dff54069d2defd6478311164dfdc700f043f16a4e18f3017cb335a070380d424933a2422a9f190071c SHA512 5b9ba002b1ce80e106f9cb79c5210616daec3718c9c02502d4e5adbb7144df4a1c18795e5a44ec08927cf3a2135470cc3c505afb8a2a53498e4d37bf8ad91e64
diff --git a/app-misc/pet/pet-0.3.2.ebuild b/app-misc/pet/pet-0.3.2.ebuild
index f5b50a570c63..aa9a25b1ef69 100644
--- a/app-misc/pet/pet-0.3.2.ebuild
+++ b/app-misc/pet/pet-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGO_VENDOR=( 
+EGO_VENDOR=(
 	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
 	"github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
 	"github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
index 05a6d4e19022..861130192a42 100644
--- a/app-misc/pip3line/Manifest
+++ b/app-misc/pip3line/Manifest
@@ -1,4 +1,4 @@
 DIST pip3line-3.6.0.tar.gz 736294 BLAKE2B 75bc3bcd3ad547a31a1fc97f525a8575136ba1bcb48e5e9d7292732c04d2a62cd03710a4e6d76a652d5259e5081cf8cc8c2dfc3265ecf1f3ea5cbc6870c02ab6 SHA512 4263d18749533f1137dc3546a6a5b5856f9c5dc09355c866c7e6a8fc59787c84ee979f648f563c465aab314ff9155bba6e34e7d4641438d96bdb786c93dfaec8
-EBUILD pip3line-3.6.0.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
-EBUILD pip3line-9999.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
+EBUILD pip3line-3.6.0.ebuild 2156 BLAKE2B 8d357980d5aeaec72fd1001b460a9c7e2a7953517983a9d57d5150f9521cac25bc9fe92a1677e4a83d237131e28be2dc9f045afae34d2bae742bbbfa8e472f23 SHA512 363ea88afc4f7be471fb624a8129e8e195cbcfd557f2615219a49848edc9d49e8e6a2150ec0309fbcb6ec52c6ea8314b73f099ac57f968f2a9c261d7b3155d2a
+EBUILD pip3line-9999.ebuild 2156 BLAKE2B 8d357980d5aeaec72fd1001b460a9c7e2a7953517983a9d57d5150f9521cac25bc9fe92a1677e4a83d237131e28be2dc9f045afae34d2bae742bbbfa8e472f23 SHA512 363ea88afc4f7be471fb624a8129e8e195cbcfd557f2615219a49848edc9d49e8e6a2150ec0309fbcb6ec52c6ea8314b73f099ac57f968f2a9c261d7b3155d2a
 MISC metadata.xml 617 BLAKE2B bf8ccd6ecd2783621a6e1c91c216afdf58ae3f4957541fe830fc3a39478331535b50097ae30f51d4ce305cf013cd613b45e3fca41d93b00f0e9a468c3f7b6346 SHA512 49298f62bc28cf669a9308741352fb510a1e7c5ba3749bfe6a9cb284e0ae35be27f672c404c194719440d68c2667f7ac58bb134335c5c95937c1b2e1d5f9e94e
diff --git a/app-misc/pip3line/pip3line-3.6.0.ebuild b/app-misc/pip3line/pip3line-3.6.0.ebuild
index 8506a3ba9967..6bc81c630244 100644
--- a/app-misc/pip3line/pip3line-3.6.0.ebuild
+++ b/app-misc/pip3line/pip3line-3.6.0.ebuild
@@ -23,10 +23,11 @@ LICENSE="GPL-3"
 SLOT="0"
 
 # A few comments
-# the ssl flag is just there to enable the plugin for low level crypto algorithms. 
+# 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -53,7 +54,7 @@ src_configure() {
 	)
 
 	# distorm is statically linked, due to insufficiencies
-	# in the current distorm64 package 
+	# in the current distorm64 package
 
 	if use distorm; then
 		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
diff --git a/app-misc/pip3line/pip3line-9999.ebuild b/app-misc/pip3line/pip3line-9999.ebuild
index 8506a3ba9967..6bc81c630244 100644
--- a/app-misc/pip3line/pip3line-9999.ebuild
+++ b/app-misc/pip3line/pip3line-9999.ebuild
@@ -23,10 +23,11 @@ LICENSE="GPL-3"
 SLOT="0"
 
 # A few comments
-# the ssl flag is just there to enable the plugin for low level crypto algorithms. 
+# 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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -53,7 +54,7 @@ src_configure() {
 	)
 
 	# distorm is statically linked, due to insufficiencies
-	# in the current distorm64 package 
+	# in the current distorm64 package
 
 	if use distorm; then
 		mycmakeargs+=(-DWITH_DISTORM_LINK_STATICALLY=ON)
diff --git a/app-misc/radeontop/Manifest b/app-misc/radeontop/Manifest
index 6f3d4bce48e6..5f779e20ad09 100644
--- a/app-misc/radeontop/Manifest
+++ b/app-misc/radeontop/Manifest
@@ -1,6 +1,4 @@
-DIST radeontop-1.0.tar.gz 32677 BLAKE2B e3445c400dff0f8afaa743d349477b67ccc4da187cbf979fe42c63b9e60f246f54e5fa2076ef6af789fea093c175d0ec66fa9f0f30bfb926a28f1aa12f2b10cf SHA512 bd7e8ecff962d8ac3072f3f1fa7a5d9981e2da28b38a1f234f6fe550511c3fbda2c1c6e9a6d1120bf99ef3ae621a91ff67c451eaf98dfa1264e9e6a59ae55e08
-DIST radeontop-1.1.tar.gz 33527 BLAKE2B 920376e5fb8acffb181b7a9e1362f46bad2de66fcf3665dc212f931d9b6fb9bf3f6765e2f8de78f8b2ba7d13cc5baae3e4d3b0612a1097f917420a43b3215f8d SHA512 abf4e51582cc668e1abbcd87bfa6ec5f16a301c3327a276a6f27fe928f780acf1442a696bb00bdbd3e8cad21a1416ffcf500a865dd4bac9517fac1a43d851c5a
-EBUILD radeontop-1.0-r1.ebuild 946 BLAKE2B 6dcfb167e77aefa263764053f0684befc113d832bc81c4ba9d81e352ed0c8b87c2090c2e4982dc67fd2d5d0b538ec549aba84871268f41115c569911e2512545 SHA512 2d129777b521aee7510afb4dd4768e289e85358cf459113b0fbdee379f0075fdb1b5000ded11ed50330564e91863d1fa60ee4e856bb0796135f31e1464cac611
-EBUILD radeontop-1.1.ebuild 959 BLAKE2B 7a3ac2dcd1683cde61dfa6d73ad9bfb6bd2527a5598950923bb8a9a9395ef35a668396993e73ff9ec3cf5e46a8d4692343f2e980785555f51576180a48a15b15 SHA512 0a5394b279d4a9addc9dfc92f71b38561a4bfc7d27fa3009309364421e758d5e0a24a2af813f2de33d3fad155162762810050ba5bd12b102ee19b5ad1ec7e436
+DIST radeontop-1.2.tar.gz 35319 BLAKE2B 52a92b86379c9340b8f59b3039a4ad725827e1b3ee2bb7d2f544d6ec8730e03ab1baab266edbc263195e68ca56a4e7b3f251337401775fff588fbfb8bae0751d SHA512 f36c2e418fe8add77080642e575b99c092afeda24811f33ee161a8c9341decb611f631e5511a5255089d63e172eda6836295e5795c3ebd3f5cad172f7599d862
+EBUILD radeontop-1.2.ebuild 956 BLAKE2B 6ba9a297d6367d6370dc2393b4ccafbfb876168755ba29f51944d93253866e6490126b5d11defb354bf113786a5dc7448a16373ccb0fa5b08af6923d20d7b697 SHA512 192d78b9c90a8473c5cb54fca7fa89fed17394a44ed8353f55c327802794bc3eda18853dca7bdebefb769e63aaab2aedb014711f073894dabf00d87ceef56ed0
 EBUILD radeontop-9999.ebuild 748 BLAKE2B 3679dd2dccc6d14c0143d888453c5eac4f57483b9ee27fb1e25a2499b23dcf3150dce541c8967f53d31cabed3fa55421cec56deef48596c537ae6bf5bb5f4e8c SHA512 eda32f616f03f1ddecce6510a2f1c14f11c6108cfda99c700fea5a423f45a788cc1ce538e3cb1ff6cc1c45578dd6227c31bd49a43531d5393f578ba7fc790924
-MISC metadata.xml 453 BLAKE2B 18fab387867187fcab94b7d38721c1010e84719148fbede0ce150122e3b5785db8abeaff3b53f106004dbf67a681265eff7488cf5abb9fa4be5d2b30a9d15e04 SHA512 3ab348ef1969d23feb339fa452ba1781308a5b2bc79da19817567e5c7a66f5c521ff4700c0fe8276d3a1f8574bc80a69aa4d63c851235b8fb089f141d4f37983
+MISC metadata.xml 461 BLAKE2B 685cbe6d06bd43110fc0693b41ed63bace9ed7447e513074b569b10d2d2a431c9660880d74b7133584b35cd9a1d85f74b6e183d39918de19ac2f82f489a43cd6 SHA512 28ba026cd450a45a7ec9d16b09df6f35039c47277d2115ae97501a3af98eb405655e7b7262adca9277c18819fafa1f2b58d94682faa9fff1bba36677bab60fb2
diff --git a/app-misc/radeontop/metadata.xml b/app-misc/radeontop/metadata.xml
index 4229aa40eac1..b7acaa774ca1 100644
--- a/app-misc/radeontop/metadata.xml
+++ b/app-misc/radeontop/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bu9zilla@gmail.com</email>
+		<email>m.mairkeimberger@gmail.com</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-misc/radeontop/radeontop-1.0-r1.ebuild b/app-misc/radeontop/radeontop-1.0-r1.ebuild
deleted file mode 100644
index dbe582980fc9..000000000000
--- a/app-misc/radeontop/radeontop-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to view Radeon GPU utilization"
-HOMEPAGE="https://github.com/clbr/radeontop"
-SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	x11-libs/libdrm
-	x11-libs/libpciaccess
-	x11-libs/libxcb
-	nls? (
-		sys-libs/ncurses:0=[unicode]
-		virtual/libintl
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	cat > include/version.h <<-EOF || die
-	#ifndef VER_H
-	#define VER_H
-
-	#define VERSION "${PV}"
-
-	#endif
-	EOF
-	>getver.sh || die
-	touch .git || die
-}
-
-src_configure() {
-	tc-export CC
-	export LIBDIR=$(get_libdir)
-	export nls=$(usex nls 1 0)
-	export amdgpu=1
-	export xcb=1
-	# Do not add -g or -s to CFLAGS
-	export plain=1
-}
diff --git a/app-misc/radeontop/radeontop-1.1.ebuild b/app-misc/radeontop/radeontop-1.2.ebuild
index aea4af8f9436..0a3872644e86 100644
--- a/app-misc/radeontop/radeontop-1.1.ebuild
+++ b/app-misc/radeontop/radeontop-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index ff30f3b0cb7a..2a550f930e93 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,4 +1,4 @@
 DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
-EBUILD ranger-1.9.2.ebuild 1062 BLAKE2B b59606cd9dd4f63b812e2ac1b97455c7b54041a844da5bc99a3cc76322228aa1d8c9e48ef5f92e74c9ce57cc052fb287a1899537859c266dff51e89b20569956 SHA512 5b632e83732b6443797c3eb81b51531f71c9f0ac8295bf34a861eab18e7ad257a75aaec8c693911ba53e947cc314b6d179a9c12c6f2b1173233875d44a569cee
-EBUILD ranger-9999.ebuild 1064 BLAKE2B 3f1ac4ab95405186a6c072d56a0e8d003ce6a8788139aa64f5b4bdf23242df961b4c2b7a428fdea3bff5a692e18d243205a906774482ed7af96bae6ee2655dd0 SHA512 252f8781834fc376d6f9353b59cc4d253c216b3dffd03d6947a941e8a0e58c08b010abc76c63d5b9360356fb7ad21f29ebb9abd0bcb8a551b7ced6de0528ba07
+EBUILD ranger-1.9.2.ebuild 1089 BLAKE2B 91eda15a696f8003f2e7fe52fa85d76af8d1637ac5a954554e331cb730868b75bdca707a144bdac237e5236e456a24a92789787e4f1c2e39e4f993dd015d5bd3 SHA512 b64b3bc1808e162698d89721bcfb1a2bf220182a144338ca03b7a13da1ff4a10c44db6fc92bf3810ef282f515c2a5244421721f9976685c1a06e96c12fdc5ab9
+EBUILD ranger-9999.ebuild 1091 BLAKE2B c3adf38cab57b75499778afda6aaa00a8f324cecaa1a6afe4bc8ef58efe1689e9ce0395ee9a586f7315c2f172036ed2c055d4a0cdfea61ec39cdf6d3947d4509 SHA512 6a25719d142ddcf2bbe5acdc05924ff08d635d5b9f7204a23ae21c7cb7d1c58aa4b5f5b9c4c06737921ce12123eeba5d173e5496794e48b4c1526d20504388fb
 MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54
diff --git a/app-misc/ranger/ranger-1.9.2.ebuild b/app-misc/ranger/ranger-1.9.2.ebuild
index 1716e07e83b6..3cbf21455d04 100644
--- a/app-misc/ranger/ranger-1.9.2.ebuild
+++ b/app-misc/ranger/ranger-1.9.2.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/pager"
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index 901ccceb1071..6d89ea92ccb9 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://ranger.github.io/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/pager"
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/app-misc/rtlamr/Manifest b/app-misc/rtlamr/Manifest
index 46eb4b02097f..74fe1f30b45e 100644
--- a/app-misc/rtlamr/Manifest
+++ b/app-misc/rtlamr/Manifest
@@ -1,3 +1,3 @@
 DIST rtlamr-0.9.1.tar.gz 961802 BLAKE2B 164e3071871a52ab13cadf55f3ac79243625de01f054ff0777b45928f8fc2f29c9088a1935499ec9363efeef66ec07ae68e659aa82662d5198c0037bbf953cef SHA512 1219d408ca324a2bb8a3b412fa1c8c04c637560cda2d49e5b66de7c8082d01f0ccb6b3fb4db520a5bc9ef74285c74e0b160b3c7c9de6fdc05054c27f19d3bf15
-EBUILD rtlamr-0.9.1.ebuild 488 BLAKE2B b5f47f3f81dfcd5a0139fdad8556add30d25c1551f1c6a5f68d59f374d65bbee041b934427f244a0fad9978b44b4e8e1f9239a54e436491a606d083d30bfd181 SHA512 3f6efd48c4a59f0cff1e7f46f3df431fc9da55f78b48fa4226a46cc6bb7cb74cbf6e5055fcaf81e2b9f5920a9a9fda2a94a65f1c71ca45b1af571750ab0eb13f
+EBUILD rtlamr-0.9.1.ebuild 493 BLAKE2B 41a658fe6bd223880aeb6cff2c616471e78cc603c22c0187e5ee88d348ff01f8055d962af9ba305c6fee77ecf0858ba5c5d3a60e3c57e42ce08e8493a294e83c SHA512 12356af6d83d885135d465d0da3a858d7a5f46e7e44f90f329774a57b507f34eaeed5331057572fe78deb0b87a1a8c55264bd09a42f8f9595251ffc077619125
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-misc/rtlamr/rtlamr-0.9.1.ebuild b/app-misc/rtlamr/rtlamr-0.9.1.ebuild
index 79ac536bfedc..dd07e13bf52e 100644
--- a/app-misc/rtlamr/rtlamr-0.9.1.ebuild
+++ b/app-misc/rtlamr/rtlamr-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 src_install() {
 	dobin ${PN}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 9564203d2902..df56fec6e7e8 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,6 +2,7 @@ AUX 2.1.8-doc-options.patch 2121 BLAKE2B 08344eae558de800f1081c7a12a3b373915adf9
 AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56afcef760d6aceaa5b286389676c27dc529f62b5b4be26dd7ba28d6cbe865cf1d0e3e0b0c76bd4e026cfeff25b63b7d98a3 SHA512 0ddadfebdd8f3b8275b9f16c110e63c557549cc903e0fe8b2df4975fb69d3c529bfa6e7a4f7e78dfca2845b6b6b561a5d608bc139e74d45788d0bed477bb5eaf
 AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
 AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
+AUX 2.1.8-vala-0.44-compat.patch 1597 BLAKE2B d26e88039d9aca0544c5e5fd510f8b5d5235f44ca79927aacdee83987b74196433106c26194134651d2fc44e97ea02dc91c565b43322d07f7a1dcb36b0c5ea84 SHA512 7d5940f240b6bbf62e248b165835ae08f95edf9038cc761bb972f756a1870f08d8cde1841cf3830dce0a3ec09d95cc6d24d54b603b40856dde614bbf3886dd84
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
-EBUILD tracker-2.1.8.ebuild 2843 BLAKE2B 85cb8f73d9ddb9044e4f755ff7613b1d17503ef1437fdfca5171e05c868ec7e2e4a58c9997b895b9ac3f52b55697583b86be4888ffc3bf8ce28fffe70fc4b6cf SHA512 dd969c28428448457191c233a0dfced6cb0e920ab11ae9d6cbf0e53a2691b8d9bcfe3f0d99e6d895b04bb62ae6d72e33e4b516e992c0fe763e0295cdc575a4ef
+EBUILD tracker-2.1.8.ebuild 2917 BLAKE2B b92781992ff10c60b9663e4d1366a168d6b7ea3c9678d59af89aceb7756a6ec46facf2cefc778de7e5f73d475e9998910a732fc941bc7584d5e3588b03c8c489 SHA512 79a21bd45e9b869d0bc854751180a72da4e70f405551c7b693a56ceded7908a18ad1f88f561b1e26239651796c9f97503df82cd25b3569d81f94dd266254dc4a
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
new file mode 100644
index 000000000000..85a7eeadc2ba
--- /dev/null
+++ b/app-misc/tracker/files/2.1.8-vala-0.44-compat.patch
@@ -0,0 +1,46 @@
+From e93ea9167dc4185b6c29b27abdab55b6bcd06c74 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed, 1 May 2019 13:38:34 +0200
+Subject: [PATCH] g-ir-merge: Avoid recursive includes
+
+Ensure the namespace is not part of the includes. This is a kludge and
+shouldn't ever happen, except it does (in continuous, induced by vala).
+
+The next big thing that would happen here is a rewrite of libtracker-sparql
+vala bits so we don't need this merging anymore, so I won't put much
+thought on it.
+---
+ utils/g-ir-merge/g-ir-merge | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/utils/g-ir-merge/g-ir-merge b/utils/g-ir-merge/g-ir-merge
+index ad79c2d29..321032a4a 100755
+--- a/utils/g-ir-merge/g-ir-merge
++++ b/utils/g-ir-merge/g-ir-merge
+@@ -89,12 +89,12 @@ def parse_inputs(files):
+     return includes, namespaces, c_includes
+ 
+ 
+-def merge_includes(all_includes):
++def merge_includes(all_includes, namespace):
+     merged = {}
+     for element in all_includes:
+         name = element.get('name')
+         version = element.get('version')
+-        if name not in merged:
++        if name not in merged and name != namespace:
+             merged[name] = element
+     return list(merged.values())
+ 
+@@ -153,7 +153,7 @@ def main():
+ 
+     all_includes, all_namespaces, all_c_includes = parse_inputs(args.files)
+ 
+-    includes = merge_includes(all_includes)
++    includes = merge_includes(all_includes, args.namespace)
+ 
+     namespace_contents, identifier_prefixes, symbol_prefixes, shared_libraries \
+         = merge_namespaces(all_namespaces)
+-- 
+2.20.1
+
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
index 3bce3d5c2174..a709313c84a7 100644
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MAX_API_VERSION="0.42"
+VALA_MAX_API_VERSION="0.44"
 
 inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg
 
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker/merge_requests/59
 	"${FILESDIR}"/${PV}-prevent-stack-smashing.patch
 	"${FILESDIR}"/${PV}-fix-library-symlinks.patch
+	"${FILESDIR}"/${PV}-vala-0.44-compat.patch # upstream commit e93ea9167dc
 )
 
 function inotify_enabled() {
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 4162c901dab1..f93f0789fb2e 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -4,4 +4,5 @@ DIST uptimed-0.4.0.tar.gz 55026 BLAKE2B 9f66f3cda4181c01e686896a8560ecab7bb7f3ed
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 EBUILD uptimed-0.4.0-r1.ebuild 1665 BLAKE2B cfe1181127c603e3ae41b73147e6e86498a11ed7f0f1c688821bb9fc442abf1dcd2e7a2edb87aab66fdbbcb28aae33b3acf442cb9dd2bc5c3bee1f1bfdce3481 SHA512 ce1d9b90d71a2cb49084499e22994d75e4461480f1f939f26f1fb75b2453749d2afbc55b5d8a96e6cf7b3f5d7ae4249f175a3198580e0ecc53ba566eec9c1ad9
 EBUILD uptimed-0.4.1-r1.ebuild 1581 BLAKE2B 1e3d06682282172a0cfbc8e40a81ccdebfe559b7a1d31f58db8b46924491ffdab2c9a928eb7b3006d58689cacf0ca84b45c231f933b20842bec94bdbed4d2078 SHA512 6454399030808f349752f563dc9d35ad64eede2365b5a5933a2d1c1f0a100568cc54e5c627c481f118c77db19836d6e92309344d587aef635be5474e3611bb49
+EBUILD uptimed-0.4.1-r2.ebuild 1613 BLAKE2B fa6b0aacb33dffac4e1882b85bb8ec87207584e0ead37fc74985b4f00b94b01ca1f438465d9ec1df733ed753fddb08e18e01428445fff6c301915fffc3090a45 SHA512 7a646071b46404f301d4118f4e9148a0ee88d16ee427938620b11fe72ae6b5dd5600f9838dba5f8b9a01a4e02f203f99ece7b67f95023f63f2721fbf97c84f91
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r2.ebuild b/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..1986bbd3429a
--- /dev/null
+++ b/app-misc/uptimed/uptimed-0.4.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
+HOMEPAGE="https://github.com/rpodgorny/uptimed/"
+SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND="
+	acct-group/uptimed
+	acct-user/uptimed
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# fix configure.ac for >=automake-1.13 (bug #467582)
+	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
+	echo
+	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
+	elog "or systemctl start uptimed (for systemd)"
+	elog "To view your uptime records, use the command 'uprecords'."
+	echo
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 930d932c9b2f..21679b9c4cfb 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -3,4 +3,4 @@ DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da6509
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
 EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
-MISC metadata.xml 1321 BLAKE2B c6807a0e954f939d55ad627668984afcca9cd6856122996620c110a3059a179d70f162362ef9ea490a29449c229a4bed0403f126015c64a250b5518c6fd7d78c SHA512 e24fce2de5f37d665ce6362ea03e2bf17a30c7b016228ba1cecf71c2fb83f34fca2101f15044748b1322465228bed8129bcfe144bcda9118820a9fcc6685c174
+MISC metadata.xml 1208 BLAKE2B 17c73134c7379cf058675354054df151f1cf0bd9ff93cb160d3e25a1886f6cb11d9cbe77657aae156b10d702ef8b8378b8fe22a6fe669a05738a5ecfb44520e1 SHA512 894dd6e5392755fe99649c2c1df4d03c63c8060133effafea91de975a8fa94aa691453e986bd4531a8bbf85a4431ccfd19d71a556b61fc4f119f6c02c59946ac
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index 399ce9552f86..b4f614ade745 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -22,8 +22,6 @@
 		<flag name="gtk">Use gtk+ to determine mimetypes</flag>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
-		<flag name="vim-syntax">Pulls in related vim syntax scripts</flag>
-		<flag name="X">Add support for X11</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">vifm</remote-id>