gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /app-misc
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
119 files changed, 646 insertions, 802 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dff3fac93fc0..c1df04c2aead 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index f50dcfe22bd3..3b593ee7674f 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,5 +1,3 @@
-DIST asciinema-2.0.1.tar.gz 48597 BLAKE2B 9179d19c3c6980f35004145fc109dfa938fa020e1982389f7309c7716f8e18914fb8db46e74b2d778b043399d00a3348e499e9fc1849f5f02e1a729c8bde6084 SHA512 abc7e2a83032520d42b45524fbd103bd974b6857274fbb923b274d11f0a81a8d06cd1e97f1b7d6432a47e1ded6df5e37e52c69caaf7f15b1bf8b53f17dfc07d1
 DIST asciinema-2.0.2.tar.gz 50058 BLAKE2B db04e21f41b76a7b2be1ca119b2c0a2ff29c9e525c35180d2506722b12c7d139087d0a102bd984cecd7d69e2da0ce8ac0f4bc83c631bc1373fecc8de2d29f107 SHA512 27ae831494c2532270940c3e0fedc87ebbdc1e9d8d24c37d1b63d3f74d9722d38e867fa1b46656249e5b0a84ed7ed32bb21da65f06e9c6a8b787aebdce2068f3
-EBUILD asciinema-2.0.1.ebuild 715 BLAKE2B 527c1dd6251ecf999f613409adc0da06eebdf08a12b01dff5030694e57fab13b03d385283bdd654d9522f8bdf566d4b2af54e9b95bbedb3df553e985c211cb41 SHA512 a7932f629ff6472e905931fd246702d1f308229962e93acabb48589426bf852423ab7ebe763d528581096434fa68f387d5262b918087e6aa1a525eb20ba3a085
-EBUILD asciinema-2.0.2.ebuild 712 BLAKE2B f3933813b9f7d0d25c13172bce141cc2a1b02b31319780a51b112574156ca386bba7c9c326258f495d024f4b354a688da36e04c226f63795b625c2c7004201fd SHA512 d7f62def4f26068bf8432295ff238accd1a7d70da1eed2d59925fd4971c72b4dec58f8d1543f3d516a3f73be2feed3c4b946ca88ffc4e5ec0a962462ebe28451
+EBUILD asciinema-2.0.2.ebuild 709 BLAKE2B 9abd93db0b1533e7acbb29823f1d581f98c24585d3ea79bb88cf85ba2a7793b9b108ce6ee1b4e53f0c46b354cf50503bf3fbe606156f80d4cbeeb3a8f6c5fe2a SHA512 4dfe4fe80dd355e46ac2ff854a61dc29ed3b28518bf809b0e2ce26575cf338bf5866f20721a60f74ce1ea433de1964c07e83027e5c447ae11e16cb4cc56d52d4
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-2.0.1.ebuild b/app-misc/asciinema/asciinema-2.0.1.ebuild
deleted file mode 100644
index a406e3c21806..000000000000
--- a/app-misc/asciinema/asciinema-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md doc/asciicast-v1.md )
-
-python_test() {
-	nosetests || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman man/asciinema.1
-}
diff --git a/app-misc/asciinema/asciinema-2.0.2.ebuild b/app-misc/asciinema/asciinema-2.0.2.ebuild
index a44b1367cd19..7c74de515eac 100644
--- a/app-misc/asciinema/asciinema-2.0.2.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index c70d0923038c..d859a30d91a4 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,5 +1,7 @@
 AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
 DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
+DIST beep-1.4.4.tar.gz 42881 BLAKE2B 8a191fb04f01ca2757f84693b39409d04566978ce32b07fd1b1ec88010ea2e36d3cda1ce66ba7fce4ee8cbbcd9dfd0f0abbdfc4d1bcc74db459e5ab10ec07228 SHA512 cfaecbebbbd0596bee5f304c3bd74968d06873037d054def0907dfd36e5bd6e7fbd7d7051eacedd20480b88f8b4e343db05eb5d3dde0fdced33756545b630373
 EBUILD beep-1.3-r3.ebuild 680 BLAKE2B d9b7f48c566189b8eb6c35cc3bbc39824bd539d74b2f95072b4dbe5d28e5361bcc7d08d4575fdb6b0f9e3fd301186c84b251accd236b9f004a206f0a30ae8f11 SHA512 2069f3daff4130277d6b1062040aeda4c494e1425ba55eaf85ffb130859971cccc56bf1dd99239cbbe30f17870acd80777723eb1e90a67be8d6863f347d94dad
+EBUILD beep-1.4.4.ebuild 712 BLAKE2B 166abfe03e1b67c93c8439932bc8e5167e09b1a0b01b881a5c8b56dfb08520ee80eaa7f4ac309bb94d54138c9258e4e56b6c299d6870269a935ad44a7f3460fc SHA512 9be71b132b24403cad44cc3c80acccd1ad040e8eb3ac5304993566b6ffbe0e04e8aa7c1d4e1853602f8bfb4ff381c35c07e95232cb47b39e6ac58aafc5d6e429
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.4.4.ebuild b/app-misc/beep/beep-1.4.4.ebuild
new file mode 100644
index 000000000000..e8047db74a68
--- /dev/null
+++ b/app-misc/beep/beep-1.4.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Advanced PC speaker beeper"
+HOMEPAGE="https://github.com/spkr-beep"
+SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="suid"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s#-D_FORTIFY_SOURCE=2##g;" GNUmakefile || die
+}
+
+src_install() {
+	dobin beep
+	if use suid; then
+		fowners :audio /usr/bin/beep
+		fperms 4710 /usr/bin/beep
+	else
+		fperms 0711 /usr/bin/beep
+	fi
+	unpack "./${PN}.1.gz"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index 9bcec21388c9..9ff1ecbd68b7 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -1,4 +1,3 @@
 DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
 EBUILD bgrep-0_p20110121-r1.ebuild 808 BLAKE2B 98a07f22d204e446637044b18602131109ecea3461aba61a32c0353fda032efb879567018b3941e6022b6e095f95c0ab14b9c0ea1bcbea1cca3c58507c1e6ee1 SHA512 e8730552f2254833d720425a0c6030348ff5326d0456dfe3a7c920bae0b903b1869f1aea87c698e762dbe9c2ba985473fbe4689f3f93c5df083e93a848d39041
-EBUILD bgrep-0_p20110121.ebuild 802 BLAKE2B 761e1c90982e7f28dfbdc7bc7a50502c5bb281da5040e2a5862cda1074fdfeb9fd2cb41f07a78c6580aabbc7c61cd80ea8c44a97125123151821fdaeedbddf95 SHA512 80116928aed3848cc394c084ee948e15ef9c95bb3ff8ae32ce34edeaa1459ba0eb2bb575ba95b8d13366599edfcb594b07ca741ab0fff94e587c0af30f4e7ddf
 MISC metadata.xml 220 BLAKE2B 3266a815602daa2a9da84d288e47e3328b40c967d40a801ac459539c015dbbaabe39c76945bcfe08b6499b05a2f775ea3b3094dccfeed7b62b4644f26ea4185f SHA512 be16f2417515008d47237f4a9de2584a23d02c4f7805b7b14887032db3ea5a9f6b1d6eabef07e415307f18ac4a1c08565a068a55cab9167532c0080395f207bd
diff --git a/app-misc/bgrep/bgrep-0_p20110121.ebuild b/app-misc/bgrep/bgrep-0_p20110121.ebuild
deleted file mode 100644
index c40227345447..000000000000
--- a/app-misc/bgrep/bgrep-0_p20110121.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-GITHUB_USER="tmbinc"
-GITHUB_HASH="49b098be9548d174023ad05c10f6af9d02b8e18e"
-MY_P="${GITHUB_USER}-${PN}-${GITHUB_HASH:0:7}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="grep-like tool to search for binary strings"
-HOMEPAGE="https://github.com/tmbinc/bgrep/"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/tarball/${GITHUB_HASH} -> ${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE="test"
-
-RDEPEND=""
-DEPEND="test? ( dev-lang/perl )"
-
-src_prepare() {
-	sed -i -e "s|/tmp/|${T}/|g" \
-		test/bgrep-test.sh || die
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-}
-
-src_test() {
-	cd test
-	./bgrep-test.sh || die
-}
-
-src_install() {
-	dobin bgrep
-	dodoc README
-}
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 8ed1d61f1358..912bf308deca 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,3 @@
-DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9
 DIST bijiben-3.26.2.tar.xz 865148 BLAKE2B 77bb78745295d414153e18491fd16faad29defabaff4ad979db7cc6e6fe075e042dd8b04d321282fbfbf163541818019bc2cbda0f8562010dfc32f275f3f54e8 SHA512 1db8c5e605b5c6a0fcd8743365a53b6ab2d986a18d501a3f02e892bcfc8ba91e9ca933b6f2a4318f71724b40f190d0ebc18eabfe1332de6765b9bca09d36718e
-EBUILD bijiben-3.26.1.ebuild 708 BLAKE2B ac47bec8f3827f1fdd307de3b2ef447572cee4902e42cb00f850d609ad3579197f81113795a5e043f7a5a21193c166a3465dd0178f059e90fcda7076659cce60 SHA512 525c17f986bb609e8e7efc51faee217ac1799ecfbb8afb5681c9f0e40f12dd22e32ae195d851e6f57a4d35c342465c13d1a72d9ef9341ebba984169162c021b4
-EBUILD bijiben-3.26.2.ebuild 706 BLAKE2B ae99e9d85fe53259ed2f787c92435af2faff6dcd3f8a137737ea4fcc924a9f9c96e363e252efd2e78b407983acc2efde12eaf649a4bfa8e1c61879b45632ea1c SHA512 ffac3a15b9cd477bb0c86c76aa71fa922fb8afcda7bd89ea92e994c0b086a9c6e2b5e3c014f79b855c6b88410797a824017eaaf9514cc21cb0190d6815a14cc3
+EBUILD bijiben-3.26.2.ebuild 704 BLAKE2B e65c95e57d73b6186faa1f357b2e1142d81b4a83b17e25d18dca179d2878f2bc5082addc7961c18934ce8e295e8d785ff4851cc113b3572d2844bcf64b224224 SHA512 2f53ede5cbfc0bc5b79ed43fbb8a7bb42194f2c5d8dc2a932b701879b2641bbfd807428cd15ca888a82095b36a28a0824955ccc8c1882cf4ed68059e4fa77959
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.26.1.ebuild b/app-misc/bijiben/bijiben-3.26.1.ebuild
deleted file mode 100644
index c49fe03f0585..000000000000
--- a/app-misc/bijiben/bijiben-3.26.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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=""
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4: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:2
-	app-misc/tracker:0/100
-	sys-apps/util-linux
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/app-misc/bijiben/bijiben-3.26.2.ebuild b/app-misc/bijiben/bijiben-3.26.2.ebuild
index e7fb0fc38f9f..bece6e188913 100644
--- a/app-misc/bijiben/bijiben-3.26.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.26.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 3c783d753a71..83695a92412c 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
 DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
-EBUILD binwalk-2.1.1.ebuild 1110 BLAKE2B 91138bcad83793cbafed2da690706491f2e4481e35b740123da388b48502a678eefe3d85113ee9500ab85d6dec5639d3efd3153216af78d0dcfcfbe78579aac4 SHA512 77585899a0f0cb775376ea767f4b5f1ae8f6bacebc6d2df7ec4b6a4eb3a293ba3817a6c63be6e3714f386ddec685c921255f806058954f00e0cf56bb15a76f4a
-EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2b1209d4211d85d9e2b7250234777b81c308a4551f21a2caa91c0dc325ea64034b7e670fcc9f836b3308d83c798a5f3b58b4c260e08b89fd6f78a8470364ecc2 SHA512 ec0c1b3954b6ec60982266666e3a64e989a1cd87f58451df7f2622cd8116b36fb66831bea034eca6dcdba6bba7ae5dada6fe86733150da62d79cc9c72d1acc57
+EBUILD binwalk-2.1.1.ebuild 1103 BLAKE2B 8a331146935c8d058aa0ae79be82d33d32848be8bf0552e16b5ca39d07b5bba3497318d4d1285c0db6dfb267d819bce3049b88b0f05d285da5bc69fa13c41fd3 SHA512 1027f6b54986dd9a8e9562616a64da68ebc187f43f0407ece22740284bbb486cc184435eb6c785c82d728a1b977766c1fd86cea9a0e80d7f1b8cad8c8a140738
+EBUILD binwalk-9999.ebuild 1014 BLAKE2B c924de9d8611f549c279d2edfab9615f1614b8f49fb7745e54226f21d61a8c292d7d87afbd5fa1faca47368ada1c80101f6e59a9c6f8ef52db4eca32608af0f1 SHA512 f45b2809626ab1497ca034c03ba190b9a7233dd993ef9d805e845b7d97507527fc3557002b663e72194f384e41a1bf04204c18ace60ede84933dd01b9df73a0c
 MISC metadata.xml 1043 BLAKE2B 3c31b5153464d9c439fdcab70b47aeccce5d0a8ec4acb57bf519830b80915bfe3e38dc0d995fc875f5b217bb354bc250043684188a2fc7988948039761204c2e SHA512 4f8c75bff33aee8f04748e52a6c13a866c08b1e0a9e4ff47fa5ccbf2a4e203e1324c6571edc57ce7713a1fc18af3f6d68645a725df84530aab03cf6f87dda5bc
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
index fd5e23c75834..0306c4e29bcf 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 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_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 4e8eaf67d0ef..c1bdfbf23cbc 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 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_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 808561ad2d0f..046758d31731 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -5,7 +5,7 @@ DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef5
 DIST nss-3.42.1.tar.gz 23416408 BLAKE2B 9c008ce599f3cc4de50af3a32f680e16058a42df7a844aa8f151c729a1c783177d8410b0aa2ea9887f5e69a359d84b655b78808fd817b8ccdeae458d9c7b4488 SHA512 468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20180409.3.37.ebuild 5675 BLAKE2B 3a9d6e7d6e98ab84e2300ac21a0420c835f1ef870cdab61772f3c704545a3974d01c88b461d490310a9bf33c88e4c1e40d58ff4618cb308e08057050b665b3dd SHA512 7789acd51276ba30fc1709526d62a939756c1b94896ffea4ea6dfbb0b1862c2ab580847fb2d4168be87fbde0c28f0aad45b689f2e426ee017e02991064dfeab4
-EBUILD ca-certificates-20190110.3.42.1.ebuild 5809 BLAKE2B 5748c717301e916b4f9559542887a1d474766748d53145eded9b984fd7fa9596527f139365fad2b905330d7f54c1bd1b572af8757601ffcfa87e0539cb8c6c32 SHA512 e90b46be5b0ccb10bce56fcc2dcb522b3fd3357776ee5b6218f464d6da85c915c0698bc815ac25c08b7117316a10260b736fe3a3877358c18147e0be90684bef
-EBUILD ca-certificates-20190110.3.43.ebuild 5809 BLAKE2B 5748c717301e916b4f9559542887a1d474766748d53145eded9b984fd7fa9596527f139365fad2b905330d7f54c1bd1b572af8757601ffcfa87e0539cb8c6c32 SHA512 e90b46be5b0ccb10bce56fcc2dcb522b3fd3357776ee5b6218f464d6da85c915c0698bc815ac25c08b7117316a10260b736fe3a3877358c18147e0be90684bef
+EBUILD ca-certificates-20180409.3.37.ebuild 5671 BLAKE2B 78f124e09911dc0e18ba39fee62c6257944f1661b8c7e9fe8ee50e14461b2be16c9ae8304145bea5cada7cc3b9e57b9eb187b4ea7bed4ce6fa32dcafbd9edc2e SHA512 79878c972db6601263db990afc34f33c62dfd195d8d3eae121932a7881a354d399532575da90f8194d66acb807567cc0b06f4382a84428f989431af6a015c47c
+EBUILD ca-certificates-20190110.3.42.1.ebuild 5807 BLAKE2B da51295223a2123378e3a42d39922aedcd1064ca750a9443ab3638d17f4fcc6e27e8e67188c9cc4ed02451ff78728879ed392261132abecf521e00e287a8e558 SHA512 3dcf54cbe5d8261baa2e406a43146bb1115243871db1fd2877dfa1284b6351e9f6251925d989ec1f37ee9e8c26d9d77d9336b037856efb3b1d430679a9e8c5a6
+EBUILD ca-certificates-20190110.3.43.ebuild 5807 BLAKE2B da51295223a2123378e3a42d39922aedcd1064ca750a9443ab3638d17f4fcc6e27e8e67188c9cc4ed02451ff78728879ed392261132abecf521e00e287a8e558 SHA512 3dcf54cbe5d8261baa2e406a43146bb1115243871db1fd2877dfa1284b6351e9f6251925d989ec1f37ee9e8c26d9d77d9336b037856efb3b1d430679a9e8c5a6
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
index 6dcf1e3837c7..520f0435104f 100644
--- a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
index 5bb10882fbc3..db441817372a 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index 5bb10882fbc3..db441817372a 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
index 34b5d2fc8b7a..431cf2c46cfa 100644
--- a/app-misc/chkcrontab/Manifest
+++ b/app-misc/chkcrontab/Manifest
@@ -1,5 +1,5 @@
 DIST chkcrontab-1.6.tar.gz 24701 BLAKE2B a4a47e0e41a17a535662b22deb57dd49b461694f4842a59a1a9debe8523f4216f4834c64d01c62e24e13ee4d45e526f361650b402968a164b2802e0a13d63a63 SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b
 DIST chkcrontab-1.7.tar.gz 25088 BLAKE2B 5e3cffcbcd064cfe8e9898dc74c215b14bdd69a4c110a91b73777cb024dd6dfe8d10ce862e82752baad65a8daf88dc45bee06f8e736393e0f973ee2f79f7bd96 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0
-EBUILD chkcrontab-1.6.ebuild 528 BLAKE2B c90cddccd32141129a7e263eaf4bcfefa07589745ae30df8359ef77825b3028660229e34996846787baaa863c2d8cae71215cf05e75eff3ae59c3b8b43c9fabf SHA512 4b032d1dfa0247d66f1c65a528176c816cc6ac8cb1f3e37e553547f41f0e8ea2050ad62f8497d5e059e47e0a6d796c95b252f1f4647c8cb60a47935785f5dbdd
-EBUILD chkcrontab-1.7.ebuild 539 BLAKE2B 09d120d685a46505a5d127ca7b56300b1f26fc7e41191bbd2306e775db9e8068b2e5ff62b55f1c293d984f9660c0879c816136ceee1c4b3fe81832f615d8634c SHA512 e178bb05433fa686eaff24a76c1552538199acba20258adbf28773d996f491e95a97a321a6887f4d62ee075d62a57f78f5b90f1ad3976b254d97d5c7bfb99c6c
+EBUILD chkcrontab-1.6.ebuild 521 BLAKE2B 26194262fa7bd3c2bb50ede9d9583a7b2aa06775a5ab830e49d59bb9222c259abc2e85ece099154f84909dc821b3ab5eeab89345eacf27cfa581ef20100d4061 SHA512 12e06bd8d4770c42df0910e77ec9916a12a1271dbe6db8babd0dba38fe2529f395388996fea167b9bd2e94dd4a18ef9aeeefa83205e71ba640c13b292e7ed977
+EBUILD chkcrontab-1.7.ebuild 532 BLAKE2B 98022d076f7d011afa3b8134f8758fbfdcc450c32062a9f5ff8e4f14f9491d3e50cbd743a8b8155c4bd738f5dbd765d0bea12defdee5bcb232983428547f1835 SHA512 018ddb6113c89d8a0b2e55d2701357c19e2c6a4f9df103c0ad04e542af46038af13461820182061ddfadd79959838fd7c5c1759baec205ee641555c53b6dbdd9
 MISC metadata.xml 463 BLAKE2B 82e0b38cdc6aeb0cb304f3448f326c129e5b936ff559e07e5ced9b1b72e840cc4f1573571eae46cc56639f6920e717e7d3f67eef6cf8aac5e9a11f5948ac70ca SHA512 d181e1a0b06519224d4e6b13b7157bd9741000c676e7f47c72dd27eb475d991a32480393bd62a599fb0a833908bae96b810fbdb17723723067edc6af3b3ab0ca
diff --git a/app-misc/chkcrontab/chkcrontab-1.6.ebuild b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
index bd45b594bf28..1d14ba22d192 100644
--- a/app-misc/chkcrontab/chkcrontab-1.6.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit distutils-r1
 
diff --git a/app-misc/chkcrontab/chkcrontab-1.7.ebuild b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
index b188e6979af1..44293532ef89 100644
--- a/app-misc/chkcrontab/chkcrontab-1.7.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 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_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 27514c0c2370..cb1ab93c2fe8 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,6 +1,4 @@
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
 DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
-EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
-EBUILD ckb-0.2.9.ebuild 1115 BLAKE2B 0baa0ffa72e1f9324fa4fa71eef92cdbfbe438f1f7a03519a5f39715930bc7ef4103c7280feeee9a2b2329d6f4ec6a128b869bb5b0fd1e78a710ebb49f52c8f1 SHA512 8a37d8d0814a59d5667de0726e6fbf4890fac2718a046027083e20339f5df69de5175b0b3b7370b3590d7751979ed688f179faf46b3bcb7b05f331fe418e9ae4
-MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
+EBUILD ckb-0.2.9-r1.ebuild 1188 BLAKE2B 31bd8b6247e0f3615b9f2a770e60651ebc3962390c1fb73c39138269acfd9daf30845c70a04c123a358fe52bef07933c618e748076a28bc3b7b79375374779bd SHA512 18531d54b89558b00ada031fd161f96f56105ace63b300db85aa699408184668aab56a9b21fec7c214df232525c5bbe28097aefe3bf7f1b63c650ffa0068f644
+MISC metadata.xml 241 BLAKE2B 53b81bd5f392373de9734e1bf97c56251d03f1e8fd925dc2a85ac14aef11ced9bcfaad9e469e7a1548edc92e5562b4ed631d699e1398d314320eed76446a8ead SHA512 dad8f3d5c83cf60831c21d441b8d9a1bf4941c2c5b56697ab55ade147394f83db181f3de21f5c35d8f70eb1ed80e55633489551bdb53ef27146447763b156d4c
diff --git a/app-misc/ckb/ckb-0.2.6-r1.ebuild b/app-misc/ckb/ckb-0.2.6-r1.ebuild
deleted file mode 100644
index e9ac7cbbdb3c..000000000000
--- a/app-misc/ckb/ckb-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils systemd
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ccMSC/ckb"
-SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md BUILD.md DAEMON.md )
-
-src_prepare() {
-	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
-	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin bin/ckb bin/ckb-daemon
-	dodir /usr/bin/ckb-animations
-	exeinto /usr/bin/ckb-animations
-	doexe bin/ckb-animations/*
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-	domenu usr/ckb.desktop
-	doicon usr/ckb.png
-	systemd_dounit service/systemd/ckb-daemon.service
-}
diff --git a/app-misc/ckb/ckb-0.2.9.ebuild b/app-misc/ckb/ckb-0.2.9-r1.ebuild
index 0516a27502af..a0d3d2a09f0a 100644
--- a/app-misc/ckb/ckb-0.2.9.ebuild
+++ b/app-misc/ckb/ckb-0.2.9-r1.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=5
+EAPI=7
 
-inherit vcs-snapshot qmake-utils systemd
+inherit desktop qmake-utils systemd
 
 DESCRIPTION="Corsair K65/K70/K95 Driver"
 HOMEPAGE="https://github.com/ckb-next/ckb-next"
@@ -14,16 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
+DEPEND="
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5"
+	dev-qt/qtwidgets:5
+	virtual/libudev:=
+	x11-libs/libX11
+"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md BUILD.md DAEMON.md )
 
+S="${WORKDIR}/${PN}-next-${PV}"
+
 src_prepare() {
+	default
 	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
 	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
 	sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index cb945f500083..2a82acaed1c4 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ccMSC/ckb</remote-id>
 	</upstream>
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index f05fb73015e8..9f31fe71e4cb 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -1,6 +1,4 @@
 AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
-DIST ddate-0.2.1.tar.gz 7757 BLAKE2B b2899b325d5cb45b2aa2460fa900740c41c7790823958fcd1cf971713d61283e050737b0cecdd1988c60718e2741ba1d3a0a48442b4013d9727db6a3765da882 SHA512 377ae4be0ddd2386de726603116ec64a524f2f4263cb30d2cd8f10024659f5fee552cf13de45cbaad36c93d2dfd16c0667993d67a37ba2276a96ca052265c714
 DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
-EBUILD ddate-0.2.1.ebuild 665 BLAKE2B 976c1f0c0332d87d64147d0524f46f5971b4ea37477a42a70d4e4a63281c7eb02d4e41b5d66be204c1210372376a0ba8e0a5f415e858ed27cb189e298fe1cd2c SHA512 442a9548fc42ff0aa96f36020da4e6c840cc34dcdcb487d6be2c2efe3d71043fa98bb12f100a5c07dda3eed4ade983f8213e47a445c4bc9303583f0a68b04450
 EBUILD ddate-0.2.2.ebuild 515 BLAKE2B 034aa565dd58cf0f62658cfec500552cb846f0747201ca0b2d077b1253417f7e6dcd7fd8844c02644f72659a5160127de1517ce4463ddea243683825cb1679f6 SHA512 14964fa5fa21bfebf8e9255a0d26a21e9b01eacb60120cfe7ce854bef2ab80c803b35758daaf50d2e1a90c809a0af85132955fb03749efc67a010e96b119bd1c
 MISC metadata.xml 711 BLAKE2B ddfa1311f5fa3c5604c206dc77da1e40c3095ca3f5103b54b9d0d520626b62f49c95ebb077bea726c4f43100f0ebeec47005ac307d77012f8a592f29f61cc507 SHA512 4772c77e33981110fa4f1538414db73cfc67d09c686209bbfcf331e6fcb8c3fbae87b702ef88f672cd55a99a3b0c83996a8005c5f79b1a102b8410825f27a6ff
diff --git a/app-misc/ddate/ddate-0.2.1.ebuild b/app-misc/ddate/ddate-0.2.1.ebuild
deleted file mode 100644
index b77bc135db42..000000000000
--- a/app-misc/ddate/ddate-0.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
-HOMEPAGE="https://github.com/bo0ts/ddate"
-SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="!<sys-apps/util-linux-2.20
-	!<sys-apps/util-linux-2.23[ddate]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e '/gzip/d' CMakeLists.txt || die
-}
-
-src_install() {
-	dobin "${CMAKE_BUILD_DIR}"/${PN}
-	doman ${PN}.1
-	dodoc README.org
-}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 13ab523a0d30..c5d6b20f0735 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -3,14 +3,21 @@ AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.5 2050 BLAKE2B 51908266d476c0fe21ceeb01e4fb9aede5ef70944025a26dbbaea582253e32442a938e39842371397b15c70ecfc9ae4abc8f549f75c3fdf55e1d09e16c25f871 SHA512 127f050a322ba2fd1ca92352ccfc9e3abf5e768b0c1b6e6fbb73633f4aa8fb3dbc8c9118428ed56070e91e2141edda2cd488185a272f0d0022e88ca32172cd7f
+AUX elasticsearch.init.6 2102 BLAKE2B e49581ac65b20feb24711674a2f5f46bc67d65cd8e5128f1d0868a84db36b0067b13ae39ea3f57d0b4c8ebfd91fb3d769088c29dacf8436beb66fe98cea0b03e SHA512 52116a49c9bce9ebe57316f96f3b6eff3a6bd544b930845d5fb9b74fc5f40535a0e50d71f8c7e602fbe8935ec35692b763a5255ad43afac5f7ac8ac00ba2bd30
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.15.tar.gz 33887584 BLAKE2B f0e36842bacb73a552400a8874b0eea6e01ee9b09cd4094edae227f3cab0558ef422b3616786ea5cf169a3b6d684fc784df85aaf1a5397e2fb9eeed16b657740 SHA512 7509dc7a9be63c758448c35ec2d87923b4a3a596c7ff2f92863021a9e3604ec9171ac5180014edb70b600dc3029f681212e9be703818c04b6d3938c289eea4a4
+DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B f96e78f1f28d8106948c91a0d31ea3d41b538fb0fd8534e2f52be651cf22986c76eae67c58c8ef10fef218d1646b1b4b5aa0a3625520e62e482063420775e92e SHA512 cc831e50ce311366484c47cf9fead9bd6562035132e6fd29508e78776dd71846c713d8d1e7a0a99338df46cad124149fb5d767e0ae0bbbed0b50153e234f2631
 DIST elasticsearch-6.6.1.tar.gz 114126547 BLAKE2B b335b224af0c241cbdf83f81feec103274d9cdd9ee7f9c3c5a788cbfc4d7a24b3a345aa14853e378796f733c151f7f21b5b081b2071b56f40f0f068ef6b07939 SHA512 3f8619ae6a10a34c57d8bc0c2ba3851b79a494ea05a3d02119a6e12d2c6cb6a651e73b43adfd674b7fb16664b709b643d4be9ba0785dbcc6d7a7cc41da7b669f
+DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee2434135fdef85d0bec5baa873f7bfd7cb6d340932d6b67b13a8f5095dc04d1981a029ab7f87d90c2b4a796eb198e9b8c531db9d SHA512 dcd3a6beae8b4a2322144058871074f193974565341da5703ec991947c2749ee67e87202e937148f653594f5fd33fdbb8adc891a200d4e03d8363575992eb9ec
+DIST elasticsearch-7.0.0-no-jdk-linux-x86_64.tar.gz 149074223 BLAKE2B 3c210b81de8882f99be45adc811c3867acb276978d3c788db5cb00ec0eacd0f096933849dfa066160ca2ec05e3fa2962329b200614db9927e4424602da53508f SHA512 b499aeab6a3f883547974b36221fd808a9da70ae0622856582287dcf729c3a2acfb1faef2727b17be97f64d8bb56ac5cdbae6d63f2a146027153f170ae6d91fc
 DIST elasticsearch-oss-6.6.1.tar.gz 34492424 BLAKE2B 9a63aeb86ec3bebbe685804b262316726cb93b42693f9ba8937cac65c7ec186f0bb470893568234a0b7cc8b58f0c91d2af94eb16c3d016e7533231eba32fdbb0 SHA512 0e536ff760673dd740f790f1b0c01d984bf989a4a9ad3c4fe998de4f824330ce0d5ea18f04421a8648af719aabd25a4393f90182079186e48cef539b5621914c
-EBUILD elasticsearch-5.6.15.ebuild 1686 BLAKE2B e5a66c3eb054f849bbfbc90abcdd8fdb8b5ba8ea69ddbcc8f2d9964ad70864cdd094c29480728c8d5b830184289fcb2a8c9efcefcfb6c026d7a5dfdd2f211497 SHA512 4e6f1a2478e0cfe515add2c63f6f906fbc62822fe4b79b65146e9589dba6bbfd4540c1bcb623137dcb8417c6ee36d4518621c3dac683eab02a57f0cb01a7720b
+DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
+DIST elasticsearch-oss-7.0.0-no-jdk-linux-x86_64.tar.gz 68788144 BLAKE2B 29206b277dc9997b155b54217f485c314a7efa35777bcb81908ce900e134e62d7ef14629cfeebcd3ebb724b76fe5380085ae6b50df46bdfddf5f657a0d2da3eb SHA512 ec9381d9310145b80fb2b8cdd7b7953ea7b2b45a66bf8435d8a982aed0eeb59f734f3936b4b40ec4530e106878d25c2f63d4ea7a734b12f1c8d86b39f7894963
+EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
+EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
+EBUILD elasticsearch-7.0.0.ebuild 2599 BLAKE2B 4fdab7d1b5e22f1d803c06642392a05adfa8c201dcd83964c23e3a10acea796cba12fc5aaac7aad3078ffd01c0f6c49afa967ab3485ed10731d5f304d99d8f25 SHA512 6ff2036c226f3b74cbf8c487dd8fdf8cf52e870bda3cbf43da5565a43cece9770a41ef72f018026a66f769b05bc4d18e9def22a9e8c091ea9fc0a045ffa84460
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.15.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
index f5399ac194fb..0fa64b4d2693 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.15.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd user
 
diff --git a/app-misc/elasticsearch/elasticsearch-6.7.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.7.1.ebuild
new file mode 100644
index 000000000000..80521b9e40fd
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.7.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 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/elasticsearch/elasticsearch-7.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
new file mode 100644
index 000000000000..1d757551fca1
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 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}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.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"
+
+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 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.6" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.6 b/app-misc/elasticsearch/files/elasticsearch.init.6
new file mode 100644
index 000000000000..046941d407e5
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.6
@@ -0,0 +1,69 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${RC_SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+JAVA_HOME=${JAVA_HOME:=$(java-config -g JAVA_HOME)}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_args_background="--daemonize --pidfile=${pidfile}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	fi
+}
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
index 719a3a25fe69..acc8883a3cec 100644
--- a/app-misc/faq/Manifest
+++ b/app-misc/faq/Manifest
@@ -29,4 +29,4 @@ DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 3904
 DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
 EBUILD faq-0.0.1.ebuild 1768 BLAKE2B bf175e390eb6cf4d0a125b1623dac6c8513085a82c55559c56710eddec75a139a1d68cbaccb74469acf69bf0af038344dd30e53705b7bd6d32f5ff534de2ff74 SHA512 2bbc7f2b9752397c5861b16bc053d09a46a2bf7a0ebf23f367620eed404d0a19ada0711f50fbb71d742127f260779594a60d07a7aa675459b47f73a55562bba9
 EBUILD faq-0.0.2.ebuild 2038 BLAKE2B 4d66a88e6710a29bc2fa2c9609b09f59b7393d01cba61f1c776b5cc80957bf742b84df1f77d614942f111cb4e0f39b216588ca672a330de2b36768374355c656 SHA512 b28006be2f78ed512e23e7e2c606e6298ffc314ce2c4c456393d329d8fa5175f44e4483cf354edbe05de2a60e26fd37aff1cd32ff245bf0e8cdbcff488ca9134
-MISC metadata.xml 324 BLAKE2B 4e3f348285a9ba513382c20b245bcaf32529fa44a7b9152f3f3ee99e4e730d056ea06a808d0797ff02fe0a1a38a39959ca364bf85dba177d9a6bb70575f92488 SHA512 19ca8fa72afdebb725d33ff7f0faacf4e643c4c13af81980bf96beef3f2d29614d2ea5de4a347a7b83006078ae6d23f92fe58ed25b690699478abb743670a654
+MISC metadata.xml 246 BLAKE2B d031b734e218edba4b23370a7939d2c35dd3373ab8d19f348ff8d2496df0b385aa5af4647bd9cd8c4f0294760c242e84d9e851a191a58cb879dabe6ac92e6a0d SHA512 692595d65c509eaa4ad7e3fd4f31b67e8499a0c4415b8c49fd511d63816f47047552d737d1f8c761b89a6c1050f0c133309790efccb8358886543e7b4359cad5
diff --git a/app-misc/faq/metadata.xml b/app-misc/faq/metadata.xml
index 9003aa1128ff..c6457138ed9a 100644
--- a/app-misc/faq/metadata.xml
+++ b/app-misc/faq/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jzelinksie/faq</remote-id>
 	</upstream>
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 4510608ba05d..ff8939b14f02 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -3,5 +3,5 @@ AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5ad
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
-EBUILD fhem-5.9.ebuild 2359 BLAKE2B 5cdbf07dc8cdfeb9ac223edc366210ea91ade46d0e959935a33c592b0cdcb2eaa33f35c3c9d534be4bc9d9cdeef951aa1e46365fce7b5882745f3e3b1eaca621 SHA512 676f0f4a8d878f61e4ec9c32b38d756c2c5a9b5902baabd0b1562e1232c8e2b0705d4ed819325b46940b6cd08aefc16089995626d09eb6b1e77c541458b58271
+EBUILD fhem-5.9.ebuild 2358 BLAKE2B f8d9ab44b50c779d5ffccc60317f6a69bd7e4ff0519d1bf43c3cd1703b80df58241f5dfd8c68631be954b6f98b1c85cce105c3fe8710696a2b4c453e9f33db24 SHA512 c9ec203f928fc697a5c4de2427d03d03994034fa22dab87611584f03672c741328e20be35de1cbcff40c8991ee9e4797ff04b9057c4e21dda5251030f9cb7d76
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
index 622c74eac409..63431ab1f506 100644
--- a/app-misc/fhem/fhem-5.9.ebuild
+++ b/app-misc/fhem/fhem-5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ DESCRIPTION="A GPL'd perl server for house automation"
 HOMEPAGE="https://www.fhem.de/"
 SRC_URI="https://www.fhem.de/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc"
diff --git a/app-misc/freeplane/Manifest b/app-misc/freeplane/Manifest
deleted file mode 100644
index 32c526c92ca2..000000000000
--- a/app-misc/freeplane/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 548 BLAKE2B 37da994e9e39b96b2628c9625fa7434d9063db9a56056e26fbfc8a75ec5f3cbc7a265663f3f90c467e0eba1e010286190e8405f72a8e66e1daffb74026d5f887 SHA512 c6dc6a125f959154995e3c94f781e1a092a42f2809b18ae413297d7e272141d8338e4ba8c835567a044fc309bc7b24c10ac8bf4a902944965ba21fdfa381b3a5
diff --git a/app-misc/freeplane/freeplane-1.5.18.ebuild b/app-misc/freeplane/freeplane-1.5.18.ebuild
deleted file mode 100644
index fdec42967700..000000000000
--- a/app-misc/freeplane/freeplane-1.5.18.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc"
-
-VIRTUALX_REQUIRED="test"
-
-inherit java-utils-2 virtualx
-
-DESCRIPTION="Java application for Mind Mapping, Knowledge and Project Management"
-HOMEPAGE="https://www.freeplane.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}%20stable/${PN}_src-${PV}.tar.gz
-	https://dev.gentoo.org/~xmw/distfiles/freeplane-1.5.18-gradle-cache.tar.xz"
-#generate cache file by disabling --offline, ebuild clean test and
-#tar cvJf /var/cache/distfiles/freeplane-1.5.18-gradle-cache.tar.xz -C /var/tmp/portage/app-misc/freeplane-1.5.18/work .gradle/caches/modules-2
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND="${DEPEND}
-	>=virtual/jdk-1.8
-	dev-java/gradle-bin"
-
-src_compile() {
-	GRADLE="gradle --gradle-user-home ${WORKDIR}/.gradle --console rich --no-daemon"
-	GRADLE="${GRADLE} --offline"
-	${GRADLE} build -x check -x test || die
-}
-
-src_test() {
-	virtx ${GRADLE} check test || die
-}
-
-src_install() {
-	cd BUILD || die
-	sed -e "/freepath=/s:=.*:=${EROOT}usr/share/${PN}:" \
-		-i freeplane.sh
-	newbin freeplane.sh freeplane
-
-	insinto /usr/share/${PN}
-	doins framework.jar freeplanelauncher.jar \
-		freeplane.policy props.xargs init.xargs *.l4j.ini
-	doins -r core doc fwdir plugins resources
-}
diff --git a/app-misc/freeplane/metadata.xml b/app-misc/freeplane/metadata.xml
deleted file mode 100644
index fb07d0fa750b..000000000000
--- a/app-misc/freeplane/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- 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>
-	<upstream>
-		<remote-id type="sourceforge">freeplane</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 2687390358d0..9bfa36554bc9 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -2,5 +2,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.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-2.4.13.ebuild 1682 BLAKE2B 96815c2ca11afecb006e9fc617828b9182943fd6521934a6c47031402653996a9257366828503247838a569aa6d11e7faff3df756820863f6ff41d54bfbd5dbc SHA512 f2be75fae7d6400c7973cded35c6c61e4d6e3958d44e1bcb374ca7ea3e9394315c40319d50f5999713affb52a36a5f99b9a90e57bb07e4a36a2ad4706914e668
-EBUILD geoclue-2.4.8.ebuild 1593 BLAKE2B 777a65cc6b1249f4f2d80784d6d367b1f23ec70d2840f1ac165a019f4710993c49ba894a91786fd8b1627b2c44f99df5ab2d1e12ab7bcb58407dcaa852450a0c SHA512 c1e4e05051dbc1a18e72cfba1c60adeff595b72600a1fdf3c923367ba86e6e4fec5d38b45171ce7eee7c11b0d9209e9291a62212107056423e384d91a2cf26f4
+EBUILD geoclue-2.4.8.ebuild 1592 BLAKE2B 0f3d58e79786d2b0e80905d9bf236e6f6d90e1fb6a98051c319abb89d8723097a4690545468a191bac46bf9317962bee5012dc67d6f5fd00722d084d63ad718f SHA512 ed5f5259c3913294d0b9698b6f7b536c34b546401c7fc004705d1a534cd3fffffe879958274e59152769b082329fce822167652f4640e1b5cf19b5096e0e372d
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
index 33986bfacb0f..da7047d77a4e 100644
--- a/app-misc/geoclue/geoclue-2.4.8.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x
 
 LICENSE="LGPL-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 +modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index cc0ee0c01b9a..d4922e090389 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -3,8 +3,8 @@ DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b69
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 DIST gramps-5.0.0.tar.gz 16773759 BLAKE2B 603a73b448fd41e4d491ca681c0177112541ff780566756f26a2bca7614a4699b90006d321e7925dd936a32367ccfd9b4b93d6ce70af5b750de641b17dd9c2d8 SHA512 95d775fc48a8165b14431a76cd9e60a80df5db0256c98d953fd1a270849446748d8630e0b5ff1b823345fcc7992b48a7c9d577c81a28e10ba0a6177f2501b6e3
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
-EBUILD gramps-4.2.5.ebuild 1336 BLAKE2B fbf43f646f953dc31e245f29e2efb6c0cbccceac8272162819aaab5363d284a821ec7220c022563085e3540c2ff23e57e766a88e74bf0dece8e7188fd5b3b4b8 SHA512 4eb326bcf7909cdf56ed57d0d97203003b34472e4c6a5c774c8b55f09afcec64ef1e3ae93acb21fff40343e78179cf5fafaa6b7d3e587636b4dfca481435cb27
-EBUILD gramps-4.2.8.ebuild 1606 BLAKE2B 8a147903eb6ae7c9d75328977b6fbab798a40ae3bb9d51fb600488f780bd3194213e949f257039c87dc8d2180bf5523dae567bb54feffa09ed36d009c02d1bd4 SHA512 f324c0791d404b280784e77edd660b313e647d3bd6d8849568b7ef13816d6329f6f340c7c4ff000f7d88c054e64511b0313cd24b492319341fa35d2babd96b7b
-EBUILD gramps-5.0.0.ebuild 1994 BLAKE2B 00994156b533444378cdc892b516d6cbabfa4467292727beeaf76e5b6313a0933c79ab03e27c2d4fd407c0a1369d63d062da1c157f7d2f3c91094e159f87fdea SHA512 72f722d1d8299196e5e686036a1c276f22b03fcaa29adc00596794056180f4004203974a4f06bd3e93576bdcb83fc7188b07318ab59d232d4fb9286684b4d77a
-EBUILD gramps-5.0.1.ebuild 1994 BLAKE2B 48f577c5ae853e4cbd0bfd170bcd5a97ca641cb0f241a0b134e3859191db3a2e6f25ae6c3d43d82ee6641b7e772698580ad8698f6396fcb6c14cc759534d40b0 SHA512 fa6bede54dabd32831281da877fef395a19fa5e493689673700785200241522f42c711265875aa0d54ef33f17609be1bc45be3239dfdb1e0835e9b16c9f49a85
+EBUILD gramps-4.2.5.ebuild 1329 BLAKE2B eb4941ffc03a82ad7a37945154859b9c3dc6e13af011ac089b6d25f592e03a257b9eb7ceb2af9f667a8c1dd93e3201b914c8198f0fb60b5e32183fbf4c49bc3f SHA512 fb77d8bd3d7a498319e685b4ce1fc0aedb7aa107fd6e3dc4aee6f835fe7dc5c4cf4aa8b5cd9c89dc9a64868af49ace3b9d792c1039328b6eb720fa45a79957de
+EBUILD gramps-4.2.8.ebuild 1601 BLAKE2B 45868269d9ba22e5a62f44cf3e87be2e50c1cababffed858e27fb828cb7c1ed4fe54cd955932ffe24921672e68d7ac67cdbbf6dc212dceaff88b779b19b390d7 SHA512 751c5b2fc03b4b890531d756ff8f3c09cf33eb63eb56c0af80412f58abb5f84f4d9a0ebabed06f50828665aaa19f47e8bae081436a9e02603486615f689a6ddf
+EBUILD gramps-5.0.0.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
+EBUILD gramps-5.0.1.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-4.2.5.ebuild b/app-misc/gramps/gramps-4.2.5.ebuild
index bc0c6b1ef46b..350c693e8837 100644
--- a/app-misc/gramps/gramps-4.2.5.ebuild
+++ b/app-misc/gramps/gramps-4.2.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_5 )
 
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
diff --git a/app-misc/gramps/gramps-4.2.8.ebuild b/app-misc/gramps/gramps-4.2.8.ebuild
index 0534c161464e..55d28850eb5e 100644
--- a/app-misc/gramps/gramps-4.2.8.ebuild
+++ b/app-misc/gramps/gramps-4.2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 xdg-utils
diff --git a/app-misc/gramps/gramps-5.0.0.ebuild b/app-misc/gramps/gramps-5.0.0.ebuild
index f72ed60e1b6a..3ce0f03cb286 100644
--- a/app-misc/gramps/gramps-5.0.0.ebuild
+++ b/app-misc/gramps/gramps-5.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 DISTUTILS_SINGLE_IMPL=1
diff --git a/app-misc/gramps/gramps-5.0.1.ebuild b/app-misc/gramps/gramps-5.0.1.ebuild
index cbfbb66359b6..3ce0f03cb286 100644
--- a/app-misc/gramps/gramps-5.0.1.ebuild
+++ b/app-misc/gramps/gramps-5.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 DISTUTILS_SINGLE_IMPL=1
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index f52e14ebc0dd..7f69bf29fedf 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,7 +1,7 @@
 AUX graphlcd-base-0.1.5-nostrip.patch 3062 BLAKE2B ebcb8bf96457871e9cea6a5f8bff6e4458ff8c5f1868216645b1b5fca062904adbd3865784cf3fa260a7653e757f8e9cc534a411ed3b92cbe9f4e76ef7fccf84 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0
 AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45ee4f739d44eef28ec861040ca90b105cc8fa05ca1602d984c8ec9e08bcc8007825a3f87110f18371d530d65828b1a0d163fa9a98c2832a SHA512 7665e290b4e5e46fd62186ac1ab97b8245af8d96fa73e274e07c1660dc65c51c9b8048e4e5c0e316aa8c01233e758ef84c9202cf9142b1e92b9f172559081776
 DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
-DIST graphlcd-base-1.0.1.tar.bz2 522727 BLAKE2B 2353ddf095fc5642705682130f3336a1610d058561ca0a3ee9f1644d8a4fecfc6b45865c06732d7ba75b874b7efd6b033c64345aa359f28a9c5a1d48ae8dc0d4 SHA512 bc0ee958475e7156d90ec818542324a4220873ad5a65a2677f75ace86db8905e4a8e8dda3076628a660f90dd90a94cdd2f76eadd8fdf35615f17729041aed40b
+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.1.ebuild 2156 BLAKE2B 88bf53e015230cc32121f9eba9de4746134b71c5177c149fd56a2e1ed8cd75143db9f0b054d228db4aa809eb024efdb593c3e37fa611f373613919b492c14ed9 SHA512 7b00da60e8a9be9b54dda48fa35de27a9aa963b2ed5b9d5924be218519d222cc3abfc25833b940effe9fe0ef4908f6ead2b6893c5f100cdeb4fead5c9f936a7f
+EBUILD graphlcd-base-1.0.2.ebuild 2170 BLAKE2B 0a69218a5b16f9689af61b7308e56ed4f533d4b740b9f6fcf8ec3a8537cc228a449cd965ba5d9d32907bb92372fb88a2356044df6d44f4f99c39bfc415356101 SHA512 07c3011503e9b27d4324394206b5e3099111fd0ea9a8cb9ff80782ef134e54e0d5982ac4e9e16d380267d17ec72d2d84166dcf020696e0de52335046935c118a
 MISC metadata.xml 1077 BLAKE2B e0356b1628b9485ac746483a17cd3f8b026001676c605751f0a14b476a6f0ec37937cda4c8f6d7f4a627f7a23a68d5f5002714af5cbdfca8fa6c8ccfa43aae74 SHA512 f087452936369496699927c86029277c90cdb95504c637b118042c90726ac54b2518eab963c16b6a3deffa11ee7dcbcd2900f72af0d8a39dc0f261a4e5121fd4
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.1.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
index d2bc11532e91..dd906d2d8066 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.1.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
@@ -16,14 +16,14 @@ IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lc
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 
 RDEPEND="
+	dev-libs/libhid
+	net-libs/libvncserver
 	freetype? ( media-libs/freetype:2= )
 	fontconfig? ( media-libs/fontconfig:1.0= )
-	g15? ( app-misc/g15daemon )
 	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 )
 	imagemagick? ( <media-gfx/imagemagick-7 )
 	lcd_devices_ax206dpf? ( virtual/libusb:0 )
 	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-	lcd_devices_vnc? ( net-libs/libvncserver )
 "
 
 DEPEND="${RDEPEND}"
@@ -38,8 +38,8 @@ src_prepare() {
 	# Change '/usr/lib' to '/usr/$(get_libdir)'
 	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
 
-	# Fix pkg-config names for GraphicsMagick/ImageMagick
-	sed -e 's/GraphicsMagick++/GraphicsMagick/g' -e 's/ImageMagick++/ImageMagick/g' -i glcdgraphics/Makefile || die
+	# Fix newer GCC version with the Futaba MDM166A lcd driver
+	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
 
 	tc-export CC CXX
 }
@@ -79,6 +79,8 @@ src_install() {
 
 pkg_postinst() {
 	udev_reload
+
+	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
 }
 
 pkg_postrm() {
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index 48519013ed77..034a2810afce 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -8,7 +8,7 @@ AUX grc-1.9-python3.patch 1124 BLAKE2B 2f7f6348aa9199124ee01763b1bfde93bbe69a5a4
 DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
 DIST grc-1.9.tar.gz 29252 BLAKE2B f74c44e7166ba9dae7ccd90ef241c01d56cf860001dca81873c0078c1702c780dd49ce7ed03774a36aa1e4564d39f2a90932aadb8b20d8ed2f0741aae831d154 SHA512 947f4b61a8d4061e99d64e25a7b5ca2bcd042580b537ea07ea6ca609d7b81b1976b301de6036be2c199c7fa25c3f32d41a887f811ad72a1a18dd63d284e61050
 DIST grc_1.5.tar.gz 26363 BLAKE2B a4345b509581141b4fa8aeeaaf3a851b021c9314e2173e3a5485105f20182a2ecff8d0829537b24d1c972520cc78837d8050f7e9e0a6e615789b227ec964ccc3 SHA512 6b95a8db5df0d99b49052deb086ac02b180810ce754c744e145e3e0508562fb632e7fdb38ec4ad039f6e998c4122b065ba53925d73268c589475e36c16aa68d7
-EBUILD grc-1.11-r1.ebuild 1380 BLAKE2B f917b77202d0f9062fa92401cdbef4fbcf212784c16c9544ac1c60e363999afe903fbb43ddec44cd0a6a330d1d7b07543fe2b3423924b2c157d8ebea559ce8a4 SHA512 84c284607ff821ca46f058df24a9eda3f0d0fc10984aae05f05d5918f6d5f1b6918c5df616bbcc9b04bd898349496fdd73fb1f1c79590bcc021b23666d6532e0
+EBUILD grc-1.11-r1.ebuild 1375 BLAKE2B 73134a81c973ab067fb1ab711e1a822a2655d085e7744ae43c11e37b618e6ff656e7ddb4f9196a899a0101d9902e2dbbeb918447d57f059c8273304484be2438 SHA512 e8df139f4c1deeeecc68a0a4da5bf2b3fee65f0bf07b87a7e3e5874b2d828a12b052c1f44f05e7b553e186a57488cf8a467bb7e1718de8d1a7c387e185e1d9b0
 EBUILD grc-1.5.ebuild 902 BLAKE2B 9e822a2eb28b034ed4e4cb4497de4991446e69042f3879c416d803b1131120b05f6caa8c7cd3a4c6350ab20705df60d90d73e045ac944e26425b62a708f3b035 SHA512 e144282e3bfe98e19c203144308da05f3478dfd1e55027d5479d76a889dd1d7bda0dbb77640b45431b6cf5e466a8ce72ae9823bf6c35cb524851dc90aeab2f6b
-EBUILD grc-1.9.ebuild 1300 BLAKE2B 7f6a448b961f887cdf0231968b28e569f9fefafd2544efc10aa538d3758c2ef2bc333bfed6c5cb70dbd02f97a22046af6835dab9814114eba56d57e354cf970c SHA512 598ea4d295763dcb49e9b22528a372e9874a21c6fa4dc4ab69754326942773e83c53fd8d4314d60068b4c7102a4e15eeb75dbfb1abe3d32d54a06f5e51159080
+EBUILD grc-1.9.ebuild 1293 BLAKE2B 9f1740cf38a8352697ed43a2e97a9124ee75e4c25c96c73d3bea3598615a4e075d518034e6033dffb535550994502fdabfaabbed9101b99931c3c10974c60282 SHA512 7b16d8d8b977944d1efd6f08f6295545ffce50bd3cad2e31adc3725771288fbbd70e13a5971a802bc6b403283639a02f173327b7ee424c5e1cb9f079f61485cc
 MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/grc-1.11-r1.ebuild b/app-misc/grc/grc-1.11-r1.ebuild
index 516d79b6b948..07a205c82bff 100644
--- a/app-misc/grc/grc-1.11-r1.ebuild
+++ b/app-misc/grc/grc-1.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
 
 inherit eutils python-r1
 
diff --git a/app-misc/grc/grc-1.9.ebuild b/app-misc/grc/grc-1.9.ebuild
index 8a0b5413f882..19693e78747d 100644
--- a/app-misc/grc/grc-1.9.ebuild
+++ b/app-misc/grc/grc-1.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+PYTHON_COMPAT=( python{2_7,3_5} pypy )
 
 inherit eutils python-r1
 
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index dd72f18c5a65..aaf03fbb0da6 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
-EBUILD hivex-1.3.14.ebuild 1847 BLAKE2B 2a60983c776c5fb1da55b47a1f4c8194cbda6513068320d03dc2f80dbb1eaa8f57f9f53cca9357b5c15eb594f532faf1452ef502cf0d6ace211fe1b3aa56058c SHA512 5c707cdd6fa4830bcdfabd020a4b09ac976ac8754fd75eb51cf4fef14eb128300f666fbac0bcd1df623dcc71e73eed681a1cfbe0e4ac5a4924b8c5c2974d82a4
+EBUILD hivex-1.3.14.ebuild 1842 BLAKE2B 5d0373e6306b746f853020cf706615621ab88bd825d7e1362c34e30246dc8c73ba6cffc5acef8e7f8c3ffc81290795a37b5acfb54389cf5d66211d0c56e87245 SHA512 dc9dd1acc9622c8492ff3a17b14173cce3a4a325aac4602bc3456528e02f46145658bf40e6d02a2a25ba87e8d5af4cb570d99fec950eca12ac4fa8368b64418a
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
index b3217d11ff1e..07099a99b45c 100644
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ b/app-misc/hivex/hivex-1.3.14.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
@@ -6,7 +6,7 @@ EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_OPTIONAL=yes
 
-PYTHON_COMPAT=(python2_7 python3_{4,5,6})
+PYTHON_COMPAT=(python2_7 python3_{5,6})
 
 inherit eutils perl-module ruby-ng python-single-r1
 
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index b0ce4662ab36..26760c986f7e 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,6 +1,6 @@
 AUX icdiff-1.7.3-dont-check-changelog.patch 546 BLAKE2B 28a4ea2becc7f9fb57a6bbcb648b4c61d0c0911e1df463cf1a566cee3e8916f3cc41f57fc912a05f733d0a73010b05e8d4ec6b2d0235edec4982a43ac2689225 SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0
 DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
 DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
-EBUILD icdiff-1.7.3.ebuild 624 BLAKE2B 5c1c29e71507e180ad94d9b9a5eb57efaaddd1d149e847d08e42dec3434ed316b2d91d05119e37187467db934773f0923233334ab93001cd0615601c4a002fb6 SHA512 b128bb425e20d560a9c7fc6d38010dbe1e7cd0eb39b24bc59418684bcfda3b515f2466dfebb809a6c09cd3a9890976ee9c8e73f5f0b5d7e03119c60235129f38
-EBUILD icdiff-1.9.1.ebuild 555 BLAKE2B 25455ee6e61775f8532794d5d1f5f9b967bf2bec53bcc7dab3122511361a4809d3b12a596c79605f16b536e08993a13d69d0d5bef633294e8cc50fcbc8564c9c SHA512 a17a7cd1edf56ee343eb69f76c29e0413e47ad5ded2eb2af059a09e607ec76613ec86a7b8524881b171dc9741a2a1e1858716361988215057dc9ca376b33497d
+EBUILD icdiff-1.7.3.ebuild 611 BLAKE2B 8302be0e057cb611b6c5fc2805c2df0c93039bd5dc307278731aa06f085edd946ab1e40370343972e1668639e8fc18ae9b2308f7d7418e61e0265bfbfd568ea2 SHA512 89a72c65a2996ca15cea189d99f3e436359d6df13421e2ff84ae7e63704d12b6b5212f8801d802f03ba3b79b34ea9611b53d51bfc19707521f85c5e02f3d98a6
+EBUILD icdiff-1.9.1.ebuild 550 BLAKE2B 1f1a425779601dd9bd462d1aa6f4925ce7d02dabbcaf09a49f0dc961cdad253162e3c2ffcda47ed2eb80a4471a98ce48418055e96243995232b09fe833923ae1 SHA512 fd66e8d60c29b48e59ebb79dca52647366dab6d80be078e4edc4107ed1c957bbef6a6fc85a85c62b7212a67bd41298237355fe27c0353ce4ca194c9de2580ff1
 MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
index c1f6ccba26d9..8d5e2ca1bb18 100644
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python2_7 python3_4 python3_5)
+PYTHON_COMPAT=(python2_7 python3_5)
 
 inherit distutils-r1
 
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
index ba4846bf4425..df0f0d0c61e2 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index f3fe14642f1c..a5e0e6b89781 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -1,11 +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-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3
 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
+EBUILD jq-1.6-r3.ebuild 1825 BLAKE2B a344024a28fe7ad1a0e4958e39debd8a7ff3dbc07b0168aeb4e04059d35ed0337a2fb9da41fbb909e92329af435d4d799ef6190d8c35c40e3a7bbcbef60c8521 SHA512 c1237979fc40dc341c6df202fdc751660b71e787f7824ecd51fa5cf9635c5dd2c1cde8961e8f12001b59d81e5da07920281b2fa5ee0a02ed7ce852e729a85e9d
 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
deleted file mode 100644
index 0b0e92600507..000000000000
--- a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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-r3-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
new file mode 100644
index 000000000000..75ab111f8810
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-r3-never-bundle-oniguruma.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6344b4e..86d968e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -47,7 +47,7 @@ AM_YFLAGS = --warnings=all -d
+ 
+ lib_LTLIBRARIES = libjq.la
+ libjq_la_SOURCES = ${LIBJQ_SRC}
+-libjq_la_LIBADD = -lm
++libjq_la_LIBADD = -lm $(onig_LIBS)
+ libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+ 
+ if WIN32
+diff --git a/configure.ac b/configure.ac
+index 280694c..d96026e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -249,6 +249,9 @@ AS_IF([test "x$with_oniguruma" != xno], [
+           onig_CFLAGS="-I${with_oniguruma}/include"
+           onig_LDFLAGS="-L${with_oniguruma}/lib"
+       ])
++   ], [
++	   # with_oniguruma == yes
++	   PKG_CHECK_MODULES([onig], [oniguruma])
+    ])
+    AS_IF([test "x$build_oniguruma" = xno], [
+        # check for ONIGURUMA library, either in /usr or where requested
diff --git a/app-misc/jq/jq-1.6-r2.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
index 9463846be754..4207cef20c75 100644
--- a/app-misc/jq/jq-1.6-r2.ebuild
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,23 +11,24 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="oniguruma static-libs"
 
+ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
 DEPEND="
 	>=sys-devel/bison-3.0
 	sys-devel/flex
-	oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
+	oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
 "
 RDEPEND="
 	!static-libs? (
-		oniguruma? ( dev-libs/oniguruma[static-libs?] )
+		oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
 	)
 "
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}"/jq-1.6-never-bundle-oniguruma.patch
+		"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
 		"${FILESDIR}"/jq-1.6-runpath.patch
 		"${FILESDIR}"/jq-1.6-segfault-fix.patch
 	)
@@ -36,6 +37,12 @@ src_prepare() {
 	sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
 		configure.ac || die
 
+	# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
+	# but the bundled copy of oniguruma still gets eautoreconf'd since it
+	# exists; save the cycles by nuking it.
+	sed -i -e '/modules\/oniguruma/d' Makefile.am || die
+	rm -rf "${S}"/modules/oniguruma || die
+
 	default
 	eautoreconf
 }
@@ -48,7 +55,7 @@ src_configure() {
 		--disable-maintainer-mode
 		--enable-rpathhack
 		$(use_enable static-libs static)
-		$(use_with oniguruma)
+		$(use_with oniguruma oniguruma yes)
 	)
 	econf "${econfargs[@]}"
 }
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 24467ad8a2fd..a4a495054a83 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -2,8 +2,8 @@ DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce0238
 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
+EBUILD khal-0.9.10.ebuild 1208 BLAKE2B 63d1490b3b59a7af0413049b44257cc2f0f57cff203e086d7b65bc29dc34c6f87eed34c09bfd89cff0afb767601b52d5384efb8c22849c4430a841d1154aac77 SHA512 44def2a12f2303881b7ed28ee189a48bfc75078f0125151e8dc7848cce9979c75a51d0a378022c9564da8e8b5403f34da346018a4485827b9b6c91c10ef0b1c5
+EBUILD khal-0.9.7.ebuild 1202 BLAKE2B 158a5effcf53a3d2e1e3945bc6058cba8839f9a2fd33ccfcb7c1b3c2be8b6d29398eb709e987b6a8912810d6ff6c5651e8f39070aff43022f0f0b415a95a4d11 SHA512 a1eb0c2282e0174bc865208bfe599c276941fa3365ce49d9b42aba1277d97ac8bba78fece9a42f6699f1a2fd36da83994bd1e806c483948600a705642a25134b
+EBUILD khal-0.9.8.ebuild 1201 BLAKE2B f507299f754add04f5e84ca4c59b770ef1d637556d35a028181c74f90748586256d23e2bc858b6f1bf8a441b01ae4b1b3b56a59e1ae43e8667055cd461ba7085 SHA512 9c0675ad1426f3bac09f1665b0a21dcac8b3cd58ad0ee1b181d27fba62568473aac56cdeb071348eff1230761f9c1152d3a559eb36b7aa34d571885fbc99ba11
+EBUILD khal-0.9.9-r1.ebuild 1218 BLAKE2B a79d94f2a613744188d6587ee3673810d0e3d6a3a8c5b273680c2e00f3e76b4d391c5adfdf680a7f3daedcf7a5c3a879207658e0f065926af7a6efd4a02431fa SHA512 844f8813a758e877b300c1b541fec272c03e8d9ee72780cb367f1d44f46a7f983f1b51ab62f15112f01e7a3e336cc2f04ebe52a642f496617544c2ba85143dc4
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.9.10.ebuild b/app-misc/khal/khal-0.9.10.ebuild
index 621809ba344e..b96dbd1db0f8 100644
--- a/app-misc/khal/khal-0.9.10.ebuild
+++ b/app-misc/khal/khal-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.7.ebuild b/app-misc/khal/khal-0.9.7.ebuild
index 794c616f1a86..6a7abbc82c06 100644
--- a/app-misc/khal/khal-0.9.7.ebuild
+++ b/app-misc/khal/khal-0.9.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.8.ebuild b/app-misc/khal/khal-0.9.8.ebuild
index ad2991cf1a98..56e145031c29 100644
--- a/app-misc/khal/khal-0.9.8.ebuild
+++ b/app-misc/khal/khal-0.9.8.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"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khal/khal-0.9.9-r1.ebuild b/app-misc/khal/khal-0.9.9-r1.ebuild
index 327d1777de15..40b70f884ac2 100644
--- a/app-misc/khal/khal-0.9.9-r1.ebuild
+++ b/app-misc/khal/khal-0.9.9-r1.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"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index bb471e9ea3e4..3fe4da499acf 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,7 +1,7 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
 DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
-EBUILD khard-0.11.4.ebuild 1056 BLAKE2B c76efd9de7fafd0627daad28594c11de71d65d2315dee87dc1dab7ae80d02fca7d82e8d11fe525c74b4caf45fbc1422e5ae3593fb28a3eec9e82ef25a956124d SHA512 02a4b8786589a7fedd7e922f3f217d0172bc01f434bfe34246d0f8d93e3e78e25d0e7ebfcfa2f556a6e720b868a39d1a8965413aa5356698824997aca581d2eb
-EBUILD khard-0.12.2.ebuild 1097 BLAKE2B 206ac7d0574a3b5c1b8ecd481fad937a9a36316b09ebfe3eb044806407e87a540a4c4bb0ae358bf31df48214e45ef6e9ba7868e67758aa2d1747b507adb87fc2 SHA512 82fa6c023edacdfe82998ae782dd48f83ab175d3f18c38db5bd77a49b166f9ef27e71e484dcf33fddfe0f518141b0a8b00678517614fba84972c0f30f3fdeb56
-EBUILD khard-0.13.0.ebuild 1163 BLAKE2B 2c1c3a5b360030fce4f35679f426d30dd6884ac4fb8710758ddc70de0219c102dac19a63b080d87bd470ce009939abf691332a66fe5c606adf92364c8330d192 SHA512 1b3beb6fc7b915e5ed2757204f90b88792da8e1bbf8044c16dcd04127aedd0132abbb2d9b77a170537dc711b392102367d154a2a333e5e8acb94addcff785e5f
+EBUILD khard-0.11.4.ebuild 1051 BLAKE2B 35281ee5be57a11f14c39972cd62d8905255fa7f3b80db159728f91f14f2f2b53fd2d8f2bdcedf95f75e54fe64cfd6bf56a53cbba7f60f615afcfcd3128286ff SHA512 fe89ba5e91eba423ad2c043032147d92bdefcb01e4ba4cd3d4ef6f5f246ecc070a9fea0a585759024f225e9cc42e61313fe246718deada83651c7b18bf439f7d
+EBUILD khard-0.12.2.ebuild 1092 BLAKE2B e9c01439843b829c52d2b88048064a066b0aa6755f1e566a37d15d7e709bf60697686529b23eb7f1778bb9288f8e58ad588cdab3cb4cf65480075c0906a41cce SHA512 21ad1929357ea9077e6946d757564d0fedc84d81781ed0251e1e940efb65121de27be5d14f140242fa910392158882cb397f3da8bb6a75c6128f96f3be80e771
+EBUILD khard-0.13.0.ebuild 1160 BLAKE2B 3f35e34b09e0fcb3945772c0db37acfbc3654554ce01b51455ae9dfa4aa652d9b28c67517735e9dbc338c38a7ab9791a1f986860ce8818c7b776e92f88856d7c SHA512 b9a90448f96291407f21765c6c2bc04feef3533227d06b9ffb383597eec7024347aed9e18b7fd33acf1e970c44f720154b2a2cf8dc202d916934ba04ba616d9c
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
index 7ab4f204a958..27c5add5916a 100644
--- a/app-misc/khard/khard-0.11.4.ebuild
+++ b/app-misc/khard/khard-0.11.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
index c33592340225..9ea3905df385 100644
--- a/app-misc/khard/khard-0.12.2.ebuild
+++ b/app-misc/khard/khard-0.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
index f4ffb0c291c1..aaa0b86fb01c 100644
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit distutils-r1
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
@@ -15,7 +15,7 @@ if [ "${PV}" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/scheibler/khard"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 RDEPEND="
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
index 90e6f460c8f8..b3175ef2a1ac 100644
--- a/app-misc/kryoflux-dtc/Manifest
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -1,4 +1,4 @@
 DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
 DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
-EBUILD kryoflux-dtc-2.6.ebuild 2416 BLAKE2B f46de2423db72922873ea8f9c6dccc2736c3a2fcfb68dd5b611519b7689a3d22f9b4892c2ad5bd32d2d9ee1e93fc2302413400b69c89ec6df71ce6509d0d8215 SHA512 f0bf9fa0b0f9e915a136386585f5668082f0cda3dc7b76b7ba30c4976002fcc6c4fd61c56479bf8c104444d0377538c354479fbbbbf80eee41cc2a49413aa61f
+EBUILD kryoflux-dtc-2.6.ebuild 2412 BLAKE2B 2efe5d5e320b4682b9db3d0d5ab063b16a430a5a87037a1686c25f78239dc0d5de3a30cc7462f48197c4671bf95885561e616f8ef03200665fee2576c98d59b5 SHA512 f9009c5f21bee4dff468bfb9bad78f869a84c2d7e4c8d631074c38d4b22fcd1468d9e55d8bba4e529f2d78087736bf533f6736bb577844e6db3ff5ce37d9ee9c
 MISC metadata.xml 582 BLAKE2B 6efbcc8d9b65499ea7025dcf9bbf1352a52abbe34a77d8ac59a8f022448ea82d12d84516104b7a719d4e9014a51460bcae29efce62a9a5e6bb41332286528dc1 SHA512 00f628fd32ab3a5568f9bbc841c38732b07d9db58ed2020703dfb0908aeaec2b07d8a6aa84e884442981126755c7d6f92cbef7238c38f2c3d6fc985a3721e9e7
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
index de512258d895..37787a6df3ec 100644
--- a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kryoflux.com"
 SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.bz2
 	gui? ( https://www.kryoflux.com/kryoflux-ui.jar )"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 LICENSE="SPS"
 SLOT="0"
 IUSE="demos doc fast-firmware gui static"
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index ed8d8a5fd567..2cb9f74bdc03 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -6,5 +6,5 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1.ebuild 3733 BLAKE2B 54b4dbb14785de95d6db40fffdd8bb7ce1213ad23825fca80b952bfcfbc64957554bfeb150b7f3919386f47d34baf876b9e3e6337881ac82dc3b0e1143e156e5 SHA512 733bd887df1fa1ff895dedf91bae965b3c41d15e5e58d82858c54eca0576a6c69519f4be07cb0e20cb58becf5192c09b362c2513eecba9bdb9b49352b14335eb
+EBUILD lirc-0.10.1.ebuild 3723 BLAKE2B 250623ead65ca83bd7f7547dbf29fd48d40effbbb8f9ad5672ff911bc09834c25442279b4f0e29ac3c1c5a8df9be2a9533269dfb870f8b9b88ee6d5daeb628e5 SHA512 6d96c077bab6629dd10ffbb8eeed0c7ccad0e2079baf2c05d7c8c59bd079ff7f9e931257501d25b7307caee9852cd3e322e11b4dcf2f337a07d87d398216afa0
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index cb93b634743b..c35abf0e0422 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 9f149b19c795..09486ef278c7 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,3 +1,3 @@
 DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
-EBUILD media-player-info-23.ebuild 1056 BLAKE2B 9235326e34617c91bcb8fcdaa431bc97c3be2b3c4f2f92f356052108b46bbc264e6058697922d4fc15c26564aaee8ee3b355354b8fa3e6ddd8e9f4d00e77335a SHA512 b33469c2c3400ed93b12c86e543a44d0730e393793544b99b56089761488eebee7eb15136f8bb1380dad7c6815ae34ca8c7abf27cadaf6d8c953281a95b51a95
+EBUILD media-player-info-23.ebuild 1054 BLAKE2B cf2399e06243ec3eb11d1cc5efddc75910cbf776f6c8a955889b19b960745ce540e9e5e692586f2422c6d0e8b179a3e96dc8e87d0eb8aea986afe06b5264981e SHA512 04e4bb48d6e999d9f50b20493b0602982984bf7d64d8992a1dcdd52f1a7562d4a8107264e8a5a655c5652a82092f07df4b19bc7f83c9e249441ae64876ff0428
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
index b5c5cdff697d..c89d7f350f98 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit python-any-r1
 
 DESCRIPTION="A repository of data files describing media player capabilities"
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index e296d3d0d232..eae9987ac8b4 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,7 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c SHA512 99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
-EBUILD mosquitto-1.5.6.ebuild 2525 BLAKE2B 5e25347f3f4b94b8406e0cb12209636d2868e64214fc1997785e02ace2e3236b85455440b668828370eb39c5d61f960679e1b3c7b6307fe526cddf28b6f1f59d SHA512 9272501a9c9be27d12d531804fea7ef889c04a7407f8611137b01ff38874e9794278aa5f18e9d8ed7dc3585dcf7244f9f3c4c5929c19c853b07d2be09022534c
+DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3 SHA512 5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
+EBUILD mosquitto-1.5.6.ebuild 2506 BLAKE2B ca60820682eb14f4bf9e70413748ca19c8da6d160bcd67641f52a2d39587275203d36d22e893267a10fa417b5ffb8a5a165e76432ecb1fe78c0bb85390d92fe3 SHA512 3200b2f1d264e1a1812f9ba3efb813aea95f4d70065abb178621c644bc44796538aac05f997822916458e6ad664a3dbbe68e8693b2e4856d6b5834139b870dff
+EBUILD mosquitto-1.5.8.ebuild 2406 BLAKE2B 318c6b1ad9a6f51fa4a40f0900bb699ab9312f43e6e5a8021ae9fcff1e8cc3fc7f5c52713f3959677824b4f0baaff02e7974c4922f0e1ab51e4eb21729a8f899 SHA512 6186bec3ccc77e6da1e9072df735f8824c3756799274277980343cc624bd8a84f8c8cff23aa9f9a2fc98282ad56a7d3c7d8b1747cab60fce2e6522989ccc7a3a
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
index 7b6a16c2daf8..6f319fe32b3b 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="amd64 arm x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="
-	libressl? ( ssl )
 	test? ( bridge )
 "
 
diff --git a/app-misc/mosquitto/mosquitto-1.5.8.ebuild b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
new file mode 100644
index 000000000000..739d887f2e64
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd toolchain-funcs user
+
+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="srv? ( net-dns/c-ares )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	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"
+		dodoc -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/mx5000tools/Manifest b/app-misc/mx5000tools/Manifest
index 53bbd1126458..fc3bcd810367 100644
--- a/app-misc/mx5000tools/Manifest
+++ b/app-misc/mx5000tools/Manifest
@@ -1,4 +1,4 @@
 AUX mx5000tools-0.1.2-find-netpbm-header.patch 941 BLAKE2B af7f7ae5d27f403b2429a4c8298acaf7fcf3971382a8c8c630b6ec12462164e2b1433894de4aac4235ae96706c0b79b4b7fba49611f31ed8a83fc73f93946abb SHA512 c663b416fae74cb937db9dce28e4b3d23ab3fb78df154f226524adb4cd8af7f5db38602e029cd8ca4ab8d66d250bd88083a92c09136fed3501e1b4dfac75aebe
 DIST mx5000tools-0.1.2.tar.gz 343118 BLAKE2B 74316ca3c730b5e03aa73a8cf5422eb3690b0e088254f9078da549f2d964df065ca7cd09f5f822cb3e66ad5bac0eab546c49703eaf837a132a61ab0755e729b8 SHA512 3773b8b233f02711bb7a768a68ccd3bf72e3d51fbb64ee2a70197d1b51e884a4f40048ba6b7dcde4be0703f25672ccb0fac9b0d6612b8a94f9e01b6a9f463613
-EBUILD mx5000tools-0.1.2.ebuild 761 BLAKE2B e550e51f34f767ffde0aa0b8f2eb33f6cfbf8c64bf78202dc65c04be8590d9d5528f7c88fd0676ebd317c3c852166604ac8ff19316e938062bd630a3709ec6df SHA512 17c20d3d2ad526ca67dcbffc73687edc727cf6a5166317bc70317d5519d1f1f71c94fedb8b33babc724bb503d4b142e6f29e2cd641464bb558e63d96868885c1
+EBUILD mx5000tools-0.1.2.ebuild 758 BLAKE2B 617501a533181cd985085b0bcb39364c4bb78d7d5302211e640fc61ccb38edda3cf1ab00e98fc67c0a59fd2bf58c5480c8c9c039ac9f338e3b2df434fc1b1c91 SHA512 d812ebde94df8415c6fe4380f4fa342fda0003f756fd33e270e257a141e4f29833fc216fa7917b9636e5a9a65cdfb58931ec3ffdba7f85b22d4500b5d2d29ee0
 MISC metadata.xml 739 BLAKE2B f242204a9d3f27f2c68cc7771be37cb329cbf57725ddb0ae823191fb62ec23050dc530b20fb22115fd2582a919375404322a8b3192734975d6eb6b187a02c618 SHA512 19a17587727e544f9c3c7dcb5a58693aa294c6e86807a610d484fb568b0a83472abc155609e5fe66e33a07d165ebd1b5968cea18b474ad5a934e99cd7318743f
diff --git a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
index 097373603932..e081f20ebcf7 100644
--- a/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
+++ b/app-misc/mx5000tools/mx5000tools-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://web.archive.org/web/20170225160711/http://download.gna.org/${PN
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 
 RDEPEND="media-libs/netpbm:="
 DEPEND="${RDEPEND}"
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
index 292257447e4f..21c53c1b5d62 100644
--- a/app-misc/notary/Manifest
+++ b/app-misc/notary/Manifest
@@ -4,4 +4,4 @@ AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d
 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
-MISC metadata.xml 345 BLAKE2B d1f59c5babe626b5a04645c4ef693cad477fc053d0730464e4b48bee515555ded5a583ca2ae246b80af310e096c334e99717af8e1be3adf692a4c9cf8f97c430 SHA512 6a57f443fe0f4e857d41a7af2658e9eac580750e7eeeab5ea6ebd5cea154c3baf74c838095c0c97493c344525d3377e3559b7c05ca5d141bdb5efda85a13eb22
+MISC metadata.xml 262 BLAKE2B 597c3ea2ec2e6106554e720aff9b70c04b0651ebf448d86468b07eef6e07112c3b66cb38296f0eb467e0442b81fcb0e72fc1ad0dcbef949cda8bf400db947649 SHA512 c7d1d7c1af64b0ed60d30a70bea37c9c60030744273c21aef968e5655cc118bcf3a43d3590ea0e162f4c97568c7483e3e86ce59de3673e451e66e62b177e060d
diff --git a/app-misc/notary/metadata.xml b/app-misc/notary/metadata.xml
index 0f3553a0a4cc..bd7fe8dd590b 100644
--- a/app-misc/notary/metadata.xml
+++ b/app-misc/notary/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>mrueg@gentoo.org</email>
-    <name>Manuel Rüger</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">theupdateframework/notary</remote-id>
   </upstream>
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index fa7afdac945c..50bde6b733c8 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,7 @@
 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
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
-EBUILD pax-utils-1.2.3-r3.ebuild 1812 BLAKE2B c6322cc812a3db52f81ad7495ac9753c29be6f2f5287c97112fe1ed0052e5b345c8e9c8290b261def4a63ca4183d1408d5c448d206a3e231142984173c5db55e SHA512 62661ca64ac3dad190af9cc4c5035e9a4b8c39c21d75cdc354000f0f465b093b39b63690b3ee297f623649a516a994830cac5bc51f76a5a623c3e62290a9598b
+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 1762 BLAKE2B 1655a8b4da729f329499ce9e6b146c79d7569c8f3e24b243c960f1a28671651f1f3cb01439a526d1846a4481b68a7702a6625cfa8dd728acc2dd540f3fde7034 SHA512 7988f3327add3949f38ec4cc4a38864c1c6d39d3e1d5ccd949edf5443274cfb9ce80f0b9ea08c72665b4740f6efe0474b08dd93d4fefe7219e100012ab0b4a11
+EBUILD pax-utils-1.2.4.ebuild 1760 BLAKE2B 75f66b9b3b2e3d5dc51d994fd59692067dc1daf505ade280b936251f39e57a05ef172cc2cd46a9ce25b9a2bb6fad241ba67d6adffa3e0bc62660bb352d2df3f1 SHA512 8e448b4ac49c2ce358132ad42a0a75d00cf54b1f3c1bab7b1572da8908eb5a97a64efa26bae056527d2ad95ad24e52f740261bdc257f572644f3141d646a132a
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
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
index 880abaa929a9..f405cb2e6dbd 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
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 92c08069a83b..ee1f50ddfc71 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_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
diff --git a/app-misc/pip3line/Manifest b/app-misc/pip3line/Manifest
index 76defde69621..b388acd94094 100644
--- a/app-misc/pip3line/Manifest
+++ b/app-misc/pip3line/Manifest
@@ -1,6 +1,6 @@
 DIST pip3line-3.5.5.tar.gz 733385 BLAKE2B e9577fb02d778b689d1c3f5849f714b7d27a5ad49a7a68e412a19cb8251e7ca1d76d0a046bfe10db2257593ccba4f1aa5fff0f34c317975f75ef347f50172088 SHA512 95cbc567f1a7f2bcbc07fe7d560829d9538c126a2748b762fcf505bad47926376abea9d8eaba8670f4c3826b988ea1ea1338faf625a6cdf8db17f457af4edbbb
 DIST pip3line-3.6.0.tar.gz 736294 BLAKE2B 75bc3bcd3ad547a31a1fc97f525a8575136ba1bcb48e5e9d7292732c04d2a62cd03710a4e6d76a652d5259e5081cf8cc8c2dfc3265ecf1f3ea5cbc6870c02ab6 SHA512 4263d18749533f1137dc3546a6a5b5856f9c5dc09355c866c7e6a8fc59787c84ee979f648f563c465aab314ff9155bba6e34e7d4641438d96bdb786c93dfaec8
-EBUILD pip3line-3.5.5.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
-EBUILD pip3line-3.6.0.ebuild 2122 BLAKE2B 7a7b9e9a0aefc55ee7e01ae70255d8735854b118546378ff15825d8a668df858524a40fbfd4e2f527f668225da0ac006854e690b206b07932563c7722a968883 SHA512 211d45be4dbb056148652892775bb0514daac907bb69b25eff4bf6d78b2a52035cd4ad16a3eab99ece80e167534f5bf317644be1993a85fca4bc8538e2a24ef1
-EBUILD pip3line-9999.ebuild 2122 BLAKE2B 9beb7ed20f5dce846dfb4bbd53855f8bffb8734add768cbf242dab4214e4ce705d3068a7febfea7df3be886b855bf8b9faee9d0e8541dd886d800db5b2f32029 SHA512 0a7aec8d9893f2e9d853ce077bb54b442b4f9d4482a183fe985650bea614455ddfd8670ba2853cfc25be5065422c8d40c36a124d1930c274270b6e7ed7c47517
+EBUILD pip3line-3.5.5.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
+EBUILD pip3line-3.6.0.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
+EBUILD pip3line-9999.ebuild 2120 BLAKE2B b44333643c594346fc1d29a624637e8d9012556c153021c28886f1656a38ae37ed3aa62bf059c040cf47f18110b429a552e0eda85079dd50b2ded8187bd1fdec SHA512 e03e62f2f1e744fbec25bac24f9060952f91295a939bad3012d5e6ee0dba94f5d63dd3c0baaaddbd7f9957bdb6fa4a0268a14b8847d3251a405321cf0b44cde1
 MISC metadata.xml 617 BLAKE2B bf8ccd6ecd2783621a6e1c91c216afdf58ae3f4957541fe830fc3a39478331535b50097ae30f51d4ce305cf013cd613b45e3fca41d93b00f0e9a468c3f7b6346 SHA512 49298f62bc28cf669a9308741352fb510a1e7c5ba3749bfe6a9cb284e0ae35be27f672c404c194719440d68c2667f7ac58bb134335c5c95937c1b2e1d5f9e94e
diff --git a/app-misc/pip3line/pip3line-3.5.5.ebuild b/app-misc/pip3line/pip3line-3.5.5.ebuild
index 9789c01998c4..8506a3ba9967 100644
--- a/app-misc/pip3line/pip3line-3.5.5.ebuild
+++ b/app-misc/pip3line/pip3line-3.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils python-r1 python-utils-r1
 
diff --git a/app-misc/pip3line/pip3line-3.6.0.ebuild b/app-misc/pip3line/pip3line-3.6.0.ebuild
index 26d9bd9f18b9..8506a3ba9967 100644
--- a/app-misc/pip3line/pip3line-3.6.0.ebuild
+++ b/app-misc/pip3line/pip3line-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils python-r1 python-utils-r1
 
diff --git a/app-misc/pip3line/pip3line-9999.ebuild b/app-misc/pip3line/pip3line-9999.ebuild
index 9789c01998c4..8506a3ba9967 100644
--- a/app-misc/pip3line/pip3line-9999.ebuild
+++ b/app-misc/pip3line/pip3line-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils python-r1 python-utils-r1
 
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
index fdcefa368acc..43ebcafb8f9b 100644
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@@ -1,5 +1,5 @@
 AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
 DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
 DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
-EBUILD prog-express-3.7.8-r1.ebuild 1506 BLAKE2B d158df25f4fd6527d377efbedf19e12c1a790e115e7bba13c082bc2174d43de34c74256af1785b0c0438c59842bef2fb0a984f39011c4d10bd4ebfa80e77c255 SHA512 2a3aba76274e65bc0b0d21c8a0d327288870b9b6ea866a2f2e05f5c75d2a6a8d396e1ec5859e94776376906b7f1c92ccb94df4cb1dff1a3a1b970d9844dc3510
+EBUILD prog-express-3.7.8-r1.ebuild 1505 BLAKE2B c43f85363ab375c53f234b57bf4664bea9fcfc1a3d50aabab467eaa2df5e0384284c8caa2b68bd927a8ad40df921e73578eaf2db53336c8c02a3a2358201adc7 SHA512 e7956ee65f1e044d8c8925336ee3eef4b01c71ded7c6f08757b207dfab658886751afd9a4a289accc0f9e9f4e71064b609b244693bc413c1a037cad721ec83b7
 MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
diff --git a/app-misc/prog-express/prog-express-3.7.8-r1.ebuild b/app-misc/prog-express/prog-express-3.7.8-r1.ebuild
index 8f6bb19e60e4..de55b876335f 100644
--- a/app-misc/prog-express/prog-express-3.7.8-r1.ebuild
+++ b/app-misc/prog-express/prog-express-3.7.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="
 	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
 "
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 LICENSE="prog-express"
 SLOT="0"
 
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 8c92bec2d349..ff30f3b0cb7a 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 1066 BLAKE2B 6fb8c97358bfc55e128ccd0288ca515e45b9f8e7d53160b010ff1c08736c68d0720cd3a8dabcb0d396c810e1f3b41b7abf97677a51fd6eddc546d9eb5dc239d4 SHA512 47ae3726af7a74fd6823ac0e003b83b36ec4bf91c297a1100e34a96e0e0a764ad2ebb2a07a76329fc8ef23b7f648398b5d70b4e839cd8193ea20826ccfb54ef0
-EBUILD ranger-9999.ebuild 1068 BLAKE2B 47becec9a1e654d590b4d87f764ba8a208c4a17009a94059d6f28ae16b55452728a37bee02f4bc1472efb84c4b3bf8f702c802d6f002325dde945d01894ba1a9 SHA512 e9bf53da055617f7c0e2d31a61fe37153eac9de966a7af28f76f0d9981c386b4952b6dca20728973e43dfdac59debba98aaa3c78f21a715ba5d3ef8271518ef2
+EBUILD ranger-1.9.2.ebuild 1062 BLAKE2B b59606cd9dd4f63b812e2ac1b97455c7b54041a844da5bc99a3cc76322228aa1d8c9e48ef5f92e74c9ce57cc052fb287a1899537859c266dff51e89b20569956 SHA512 5b632e83732b6443797c3eb81b51531f71c9f0ac8295bf34a861eab18e7ad257a75aaec8c693911ba53e947cc314b6d179a9c12c6f2b1173233875d44a569cee
+EBUILD ranger-9999.ebuild 1064 BLAKE2B 3f1ac4ab95405186a6c072d56a0e8d003ce6a8788139aa64f5b4bdf23242df961b4c2b7a428fdea3bff5a692e18d243205a906774482ed7af96bae6ee2655dd0 SHA512 252f8781834fc376d6f9353b59cc4d253c216b3dffd03d6947a941e8a0e58c08b010abc76c63d5b9360356fb7ad21f29ebb9abd0bcb8a551b7ced6de0528ba07
 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 07f8d5c9546d..1716e07e83b6 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 Authors
+# Copyright 1999-2019 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,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index b6c3b9b08aaf..901ccceb1071 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 96dee054e61f..de2d12c81f75 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,3 +1,3 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
-EBUILD solaar-0.9.2-r3.ebuild 1347 BLAKE2B 7d8c92d096e8b8ba1e7edf1d00763cf4dd86e56558784a0374041d191537e30e0d9fd31850a472127fd093b98d8eaebdd31c06ce893b98141749762710b1bd2f SHA512 f49ebacb8c389a33c3ff7e99963fd84d4905b1b23d5a32283c30e1057e9754e00bdbd2cfa2bac7a88d671494378310336c638a5913cf5052ec591899877f2f39
+EBUILD solaar-0.9.2-r3.ebuild 1340 BLAKE2B 81eb5e66a4a558ebf6538d87b6b0a9245d9724bdd5dfed6df80d2cc98dd27613a2afc06d356b38ecb3df2caf6ecb67a178100f7143983141ce07040fe22a5fc4 SHA512 36de617d819cc6021fefae82f1226c77668acf4964cffcb7134aa03256244435fa889f0c671485548a3bf4047491423c71a7cbbb80c124db25756de6e2792dd1
 MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/solaar-0.9.2-r3.ebuild b/app-misc/solaar/solaar-0.9.2-r3.ebuild
index 25e4dddc082c..bf8511866786 100644
--- a/app-misc/solaar/solaar-0.9.2-r3.ebuild
+++ b/app-misc/solaar/solaar-0.9.2-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 udev user linux-info gnome2-utils
 
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
index ae788a344553..c2c4b6b9aa78 100644
--- a/app-misc/tails-installer/Manifest
+++ b/app-misc/tails-installer/Manifest
@@ -4,4 +4,4 @@ DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581d
 DIST tails-installer-4.4.8.tar.gz 332532 BLAKE2B 5c597f38e8cfd690b56e1a08d98567278bcb12eb72cb292c02b77d497c8fc4925f5829efdbb3351fc5a30296d9138a07f2dc8077ada2e32bf7b04dff2f31193e SHA512 3a15d31d54ae17c12c1ba8346782f26678fbabcdd99582a5b43c75f520001ec01e5cc09b1832d0f7d346852f9eb30114135c92caff8690281469f35f23806a12
 EBUILD tails-installer-4.4.11.ebuild 1158 BLAKE2B 50a17a692c89d7ef4281b4d5523143027265dc7691b751013ff64df045a5b73366dcc39fcc4f05f3fa50b2129afd3210637c21ba63a2e38629e72878a1c906d6 SHA512 bb52088ac9b0a26824b894e85f13258710b6e4643c8cf3e6945aaa26973a7a65b3684713e251c83bccd77dbd66f1f5a23c655ac7368e50e8a55229fc4991b262
 EBUILD tails-installer-4.4.8.ebuild 1160 BLAKE2B 3eb26826d2ac9201bec0e8137effa1e3eff9e8f2b2d79a32f7c928768bfe51125181fb224e5c5e684717dcc0852f2705289d248bfc59da318cb833abade1fb12 SHA512 a8a7bcea7e1ffad14b6f11eb11024a3cbc3204043689cf8928201dd011bbd9d38a956914c16619c87c6a7126e2792269ccd4b951a672f3b79eede598e0b1600a
-MISC metadata.xml 398 BLAKE2B 89d09e8e687f1b78c7b57002ac5033c4f39e22b82b856487f31db3e7e5a2bc1786f416970e0f35c95bdabc3b8025326a4f85618b6891f14bcfd7881ac016e8d0 SHA512 6871f9133b0f24777a9046d0a5d51f2191a0b36bf1532d6e2d560df1e786940da997ec0cdfe59b45236e5650c907a2e7f1ebc4e7949de3dbea373db60edf3767
+MISC metadata.xml 309 BLAKE2B af6f3c6aa04dd9f3f9b808ecc90fab80f06e47641fd56b78305edeb1feb5efc50c874007ddba4ba3d414cd9993719f844d22aac97f04c41020890d4b5e6b8e25 SHA512 6e72318e11edc847698cc3b37002b61b70b62e6f8aa644fa400c55801613ec30187b6073cc9b5218911ba4e6e08603dc77d9f3585d28acf683c732dbda2b816b
diff --git a/app-misc/tails-installer/metadata.xml b/app-misc/tails-installer/metadata.xml
index 5d675ba1a31b..3d969f378b50 100644
--- a/app-misc/tails-installer/metadata.xml
+++ b/app-misc/tails-installer/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>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
   Tails Installer is a graphical tool to install or upgrade Tails on a USB stick from an ISO image.
   </longdescription>
diff --git a/app-misc/terminal-colors/Manifest b/app-misc/terminal-colors/Manifest
index 94835bbd8cf7..85f64670c7c1 100644
--- a/app-misc/terminal-colors/Manifest
+++ b/app-misc/terminal-colors/Manifest
@@ -1,3 +1,3 @@
 DIST terminal-colors-2.2.bz2 4826 BLAKE2B 8a0e2918dd4fbeade61a683fd965b947fc0acdd01be028ddce3c42831e563d97e2bbc260a9781ee0d7cb1d104a9be06f3a5bc78d9725b4cb100c172b0f4994d4 SHA512 ddd1a3cf6786011372ca83b3fe86a88c863a1fa1b5cf8450cabd364a3330847145cf4bd5eb8d50baa7c26b17c392eb0f629007dbb765b36b3904d0783216ce36
-EBUILD terminal-colors-2.2.ebuild 612 BLAKE2B d7a5aa0ed7022c5a6837d094d8f0636f4284146348bbf2770d3a9dbfb5ec878dc42dbc226f1f13c376bd0c863ca263c01966db387be047aba51f62c3765f3578 SHA512 0cc0c3e3c917faa590cf1979169854df4f6cb89b6796b225d40d7ff602c78f0b075ce6e54c900f35603a95a9f3e6771c7bc7a3264407f4756404b1607440e11c
+EBUILD terminal-colors-2.2.ebuild 605 BLAKE2B 60594390380655c6c66fff101820349718036cfbd7da9be222a389ddab3b83d794315bdf258fccf0a6dc3bc2c84d8f49bae80e2caa159cdb4c6e281d62f47917 SHA512 b2fb9886f0b0076f0809496f3263f878d8d93b92618d874cf244a53b5804ce076ddeb00c3c25444099df3d97fe3cd9f8807d7c1844f8dc95c2ef9568fb2ffa44
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-misc/terminal-colors/terminal-colors-2.2.ebuild b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
index 3d6b6e1b99fd..39936ad142fc 100644
--- a/app-misc/terminal-colors/terminal-colors-2.2.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 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_5,3_6} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index b8d0548b8535..1f6a71185b5b 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,11 +1,11 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
 DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
 DIST tmux-2.8.tar.gz 491195 BLAKE2B 1dde20282f84a32647ebb26cdd2346f8870670f904cb06c293218f9db389ded316449f7870805d6d9c1cbb417890ace5e3c36c533bf64818b219f3265b9d2dfd SHA512 e382aec122a10624953432b3c869b21d69390bc2e7d459440a46950802e39503eafb398178f8085191261925e4f0872bb99b19e0403e7beb56d3ceecc4c86b09
-DIST tmux-2.9-rc.tar.gz 510537 BLAKE2B ef5e80c51b125445be9e8f0eed2eedb9d1c71927fa2a38b68963ada40feb858e519c6cac47452615e27964957460951641a24d36eb46ef5def90129dc2bb9feb SHA512 68097d56f1ffb1e4b78fd525fae347f2e9c5cb1e098dfa2360ef4f52cfb00fcc774a2d907deb67fa595bbd5c685cd2d768a454e8b09d9f344ea8be4523e54286
+DIST tmux-2.9.tar.gz 510966 BLAKE2B 63d4fe671afc00792eae4358c0833854cb5202a4f9aab6deaec9f3f459b0786d2d966294478ab2015a8d8d88d1815385422e1bd311d9211f88e130762fe4b770 SHA512 a712da19ebea240bafb3e8b0bf313baec6f2e6c6e32babac1221a0fbaaf4da82cd8cad4e6cf3da1e277ddc830b5405d104ca69b278627d3db5d0e4439d4896b3
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 EBUILD tmux-2.7-r1.ebuild 2117 BLAKE2B 8d4bb5506da4aafd44fdcee8c8397e247cdb1c966a5fdcd3f1d47963be41325dbeac03c96c412db05327498d93f8e511a0ebd933341591566474919d54453336 SHA512 8021c387bff7c3a99adb2a21fd4e72444513b4db63d87ec72242884b407561a257e99c805988da75ca91b3258a9ab61d3b84a6bf0a1f7671932eb20a7908d4f4
-EBUILD tmux-2.7.ebuild 2139 BLAKE2B 5c9aa9bf3925ef13c0f5693537f5e67901a88b14468a9e912a3fdaa30f6df272981bff901e1ebf0018bbc28f4e6c4bde6c5c0d2b807084b4a0d73095562b87bb SHA512 8b78fae41fdcb1d773902045a5011a36f40378bb56a546d26cf50b9e2dd74dfd4e2cdf233de55dc8516748fb0094eb6cdaff88a505eeac7465f549bdf32cc460
+EBUILD tmux-2.7.ebuild 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882b1bd86964ea6d4fd2753675c04ce0d81703338ff16da679add1df1e8abb3a7473e62d8897fbd245b79dd SHA512 d4dbe7723d81806f78d1d6e02edb851ce978189ad48242f7f765d19a13635bb0428d477ceb827af845b1d1fc18bbd7b446ece50d3853534f32d6526207dfe7cd
 EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367
-EBUILD tmux-2.9_rc.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
+EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
 EBUILD tmux-9999.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index 7b74613dbeb5..42239f6e26cb 100644
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/tmux/tmux-2.9_rc.ebuild b/app-misc/tmux/tmux-2.9.ebuild
index 4615e5f5979c..4615e5f5979c 100644
--- a/app-misc/tmux/tmux-2.9_rc.ebuild
+++ b/app-misc/tmux/tmux-2.9.ebuild
diff --git a/app-misc/tmux2html/Manifest b/app-misc/tmux2html/Manifest
index 422471eeb6b8..8961c6781b02 100644
--- a/app-misc/tmux2html/Manifest
+++ b/app-misc/tmux2html/Manifest
@@ -1,3 +1,3 @@
 DIST tmux2html-0.1.11.tar.gz 20002 BLAKE2B 690e170bf903682a9bdbbfa49ec7a2995d19bfa9372533b5cecff5b7dfa4c389832a8e2315c3438d435c3b4f75bec8b7fc43161691912ef29d910779d46af24e SHA512 b478a697413acd90a92b3a349fc3c477ee1014f47816190d2066058711e2025a9f99e3f973dfd3165782a566d12aae4e3c491f58a924769d1d28c3f48c9e9601
-EBUILD tmux2html-0.1.11.ebuild 506 BLAKE2B d0c47628b4422757ccbc8a2ea0c1d32d522fe1931f1f52f033b4458b07a4c303b3d8a2c092b9ec1f3b718e94ad5dc55a6ace06160656ec6601ca8f084f7f1324 SHA512 ce6d6689dca4e50f6c70c27b3f57c04e22bee34d7fd094a39de50cff8f4699cb71822bb71cb4569a31e1652c4c7087d24d6ec93b22b9d99d0e045a9e87368a84
+EBUILD tmux2html-0.1.11.ebuild 501 BLAKE2B ba7f0555e55e03964b627a70911c2de450e14247c85b80e79cb266b5776558131d89f8626326b8c01c353e0275e084773200d86aed4380821f2cfd732661d1b9 SHA512 2d390b1f2ae11c0e50b15b45b6545f43af6f5db29988970a4e48304972976655d30fa0bab47532911ee755b5c01c902ee7412acaf31ef5766cdfb81ae0070bfc
 MISC metadata.xml 460 BLAKE2B 2f0ffe7b708299dbcacb08b48bc4cc78ab360310e1234b0d06efb65543de75996ad5f1469bab45f912ba44817072b4f1b845bea50ec9ced322b90bbeab07042b SHA512 b275a2b153cbe7d0a1f4bb5492bb0b884e16aba4baa543f050e316d9086d6d1661d6b49c11ff49711b91672fe1f4c8ffb54cf98abca409e6c50ea0001ca2516f
diff --git a/app-misc/tmux2html/tmux2html-0.1.11.ebuild b/app-misc/tmux2html/tmux2html-0.1.11.ebuild
index 81bf38621577..b0003570a855 100644
--- a/app-misc/tmux2html/tmux2html-0.1.11.ebuild
+++ b/app-misc/tmux2html/tmux2html-0.1.11.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=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 5273b313193a..a9f09e645274 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,4 +1,4 @@
 AUX 2.1.6-cue-meson-fixes.patch 2632 BLAKE2B d3d63e27b8d1ff4f3463826399133c2396dbb17fb38e9aae43df8da43aea1c05ccb6c0567235773ecaa8a5741dc75ec1be49ec06d604f6751d79e32fbb3d153a SHA512 3cfda20f1be0c956de2de2b2cc70960373c2d74ddbb895480026faa32e053bcec4db42473d15d8b37d567d2fdd2b8ccb34e8bbdcc9446fb03089eefe2fe8bd4f
 DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2
-EBUILD tracker-miners-2.1.6.ebuild 4482 BLAKE2B a5d534d8b1feda1dc7cb311cbf1b6dc2483b12121afa0e8317938874c7fbf7139f0f4158d659cac7d440dcf2059e574c81d4cd4377cde74398f72b075b13bb0f SHA512 6b9cc1269db9912eb93daa4a1a2d4f24004383243de683e3e809d2d73cd1243e82d0c9f43ab3dd345a483ec69f0af0d1d04327cd6c4ad5a4b6d6074d28f3b42c
+EBUILD tracker-miners-2.1.6.ebuild 4476 BLAKE2B 2ed41d58ba8d86590e9d0e1f57887183dded68fbf02d9876914e6ceca20eac9ea23b55231688b99878d1338bf4c006c12934abd5031f52a6aeeef51369d4cad1 SHA512 2e00876341901b1e75e894b2f101089cde4c0c1fa7da0fd19ddf320cde6b188ea51685cdfe1c4260c020f6c555ac88575af85d06bb8f6964f1899f872ed157ba
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
index 5153b47c8e87..0a0db96c6544 100644
--- a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
@@ -15,7 +15,7 @@ IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playli
 
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index cd7706cdb37c..b573193336e1 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,8 +2,6 @@ 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
-DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
-EBUILD tracker-1.12.4-r1.ebuild 7448 BLAKE2B b1552ee19ab27c1a2fb7ec5fa43de63f53f88da98d77772c979a4941bcff54299d991e20f432155652152d1b3315ffc64eaeed9073261c2f428c334f5f576e41 SHA512 b84d10c8f9979fe3e66007c7e20b229d181c9e1961a92aa70500c6461197ac4a976cc7849e4901107bb4aedb3195540ec12e577f9ab368ea4aa10059ddcf3131
-EBUILD tracker-2.1.8.ebuild 2820 BLAKE2B 57729529f599964d142f2da8a5f9568a23bc15ace8d93859b1a65e505fb94e97806e5f5fed70316952214ac13bba83a31f31dc2cad0739d52176ea78a397d42b SHA512 9386ce363bde67ccd20ccf15403fc450a4baf7a7374b9b5f3896c356dd23686df6291a9d35e07ffc127da065b2bfc1c8f168ba6dd8fcb50e114cec1bc9ec0f55
-MISC metadata.xml 1545 BLAKE2B 1fee1210e27ad5a33c7e121372a64ed7d70c5c8169ce7b2688ff395cb56a218d53a8c5561701498d52d7772be1ce77d44275c938ad9486dc039e2f301bb14b6d SHA512 b379f0ca9737f7847ec7e0e83148ef354a56433d5fcd45996feaa86d9773c60b97f226ca21aba48aaba31f17ead8ea1922d408193328f477d58449ed3a732f71
+EBUILD tracker-2.1.8.ebuild 2816 BLAKE2B eb6bb2f0476e98f9c5e48ddc602c6b5fedc07f740666c419c0b83f39b4ae247b1a3d72ff88cc54344c2bf33e928e884c607ccb1e7acbb0b209778a2963087d16 SHA512 a9bb8bce1fac193010db66dab020068013689ccfda79dd03385b16975ef039574b0721145c78e32308e3831ab8fd8bc7cf6580717bca0632945e9dcafa381618
+MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 7516a51a113d..b9ec09b52c1b 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -6,23 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
-    <flag name="cue">Enable cue sheet parsing</flag>
-    <!-- 'firefox-bookmarks' instead of 'firefox' to prevent most users from
-       enabling this by accident; it has some stability problems and
-       performance implications -->
-    <flag name="firefox-bookmarks">Install bookmark data miner plugin for
-    <pkg>www-client/firefox</pkg> and <pkg>www-client/firefox-bin</pkg></flag>
-    <flag name="gsf">Enable <pkg>gnome-extra/libgsf</pkg> based data extractor and
-  for ODT.</flag>
-    <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
-    <flag name="iso">Enable extraction of metadata from ISO disk images</flag>
     <flag name="miners">Install the <pkg>app-misc/tracker-miners</pkg> package for actual data mining support for tracker</flag>
-    <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag>
-    <flag name="playlist">Add support for playlists</flag>
     <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>
-    <flag name="thunderbird">Install email data miner plugin for
-    <pkg>mail-client/thunderbird</pkg> and
-    <pkg>mail-client/thunderbird-bin</pkg></flag>
-    <flag name="xps">Add support for XPS file format through <pkg>app-text/libgxps</pkg>.</flag>
   </use>
 </pkgmetadata>
diff --git a/app-misc/tracker/tracker-1.12.4-r1.ebuild b/app-misc/tracker/tracker-1.12.4-r1.ebuild
deleted file mode 100644
index 1e40f5389097..000000000000
--- a/app-misc/tracker/tracker-1.12.4-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 networkmanager pdf playlist rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# seccomp is automagic, though we want to use it whenever possible (linux)
-# >=media-libs/libmediaart-1.9:2.0 is suggested to be disabled for 1.10 for security;
-# It is disable in configure in 1.12; revisit for 1.14/2 (configure flag)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.20:=
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/gobject-introspection-0.9.5:=
-	>=dev-libs/icu-4.8.1.1:=
-	>=dev-libs/json-glib-1.0
-	>=media-libs/libpng-1.2:0=
-	>=net-libs/libsoup-2.40:2.4
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-	virtual/imagemagick-tools[png,jpeg?]
-
-	cue? ( media-libs/libcue )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib:= )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( >=sys-power/upower-0.9 )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8:= )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	stemmer? ( dev-libs/snowball-stemmer )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff:0 )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# miner-evolution disabled as it's incompatible with current eds
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-miner-evolution \
-		--disable-nautilus-extension \
-		--disable-static \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-dvi \
-		--enable-enca \
-		--enable-guarantee-metadata \
-		--enable-icon \
-		--enable-introspection \
-		--disable-libmediaart \
-		--enable-libpng \
-		--enable-miner-apps \
-		--enable-miner-user-guides \
-		--enable-ps \
-		--enable-text \
-		--enable-tracker-fts \
-		--enable-tracker-writeback \
-		--with-unicode-support=libicu \
-		--with-bash-completion-dir="$(get_bashcompdir)" \
-		$(use_enable cue libcue) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable stemmer libstemmer) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	# G_MESSAGES_DEBUG, upstream bug #699401#c1
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym ../../../share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym ../../../share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
index 643340f1f2c1..e4ad7a80ea7a 100644
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 PV_SERIES=$(ver_cut 1-2)
 
diff --git a/app-misc/ttyload/Manifest b/app-misc/ttyload/Manifest
index 5344cd9c1006..7fc8bddc551a 100644
--- a/app-misc/ttyload/Manifest
+++ b/app-misc/ttyload/Manifest
@@ -1,3 +1,3 @@
 DIST ttyload-0.5.3.tar.bz2 15039 BLAKE2B 0614b492a86013c524d21de9dcb2c28e357afd8cc811b103b294d60c89c8b7503ca3e47dfe0c2eaa0ff92c76ff7e4453761300ea2fae1d8f5adbbe36d201c93e SHA512 1affc171fd569d4127d7a51dda5764272e554a96db6ad4418ff6120f9b0e573679b33d45797adcb667216d167e9f3ee41349a53d4f7808b3b1c5bed76e3f4bbb
-EBUILD ttyload-0.5.3.ebuild 713 BLAKE2B 4f881ae2ad81300d4ad7fd7e3470dba988473e7ad8d60d5983a29c3d3777f169dfed5c2de5b8e7cf20c28776a8ac3ee89d9ae1be74b69d24b71395bf32dfc4a8 SHA512 9ce81b03526785457f46b962bbe5b8295e92869346c33e9fbeb51ff7b4639d5ecd6c4c7107d6f57f7bfb508fb1940e6f7a2f5b0545a295a9e575f3ca8ab4a0aa
+EBUILD ttyload-0.5.3.ebuild 712 BLAKE2B df20be59eae2251acad8beebeed734804d524a379684a93ad3fe04ae922bf6b79ffc4736b23f4830a5ae33b11b553a65915e4f15556afe1e7f045fa9b39d8020 SHA512 9f1d6f671d9ea250c8817fddec5a18c2270985046cc0f6fddc34b70897c654900cb33b96c5cf7ec7fa75b5bc79a5e4cd372e8babb7c63faca3f34c1e28be7978
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-misc/ttyload/ttyload-0.5.3.ebuild b/app-misc/ttyload/ttyload-0.5.3.ebuild
index 8f725f68538d..09ffb3b75712 100644
--- a/app-misc/ttyload/ttyload-0.5.3.ebuild
+++ b/app-misc/ttyload/ttyload-0.5.3.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
@@ -6,8 +6,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="color-coded graph of load averages over time"
-HOMEPAGE="http://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
-SRC_URI="http://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.daveltd.com/src/util/ttyload https://github.com/lindes/ttyload"
+SRC_URI="https://www.daveltd.com/src/util/${PN}/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
 LICENSE="ISC"
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 5703d06c92ed..1a8e4492c2e9 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,6 +2,6 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.0.tar.gz 55026 BLAKE2B 9f66f3cda4181c01e686896a8560ecab7bb7f3ed9cdaeaee840a589137188d8629ba414e436a99b212d386b8d3319ce88ccb8867c78335b015ed65a179154621 SHA512 918cd9e065d5005daf5062f14dffb725cb6d6764aa571fd45d63de3f7349b910cbae0dedc832f9bfb52a42caea90e8aec8390685baaf0718fec827240e517900
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
-EBUILD uptimed-0.4.0-r1.ebuild 1476 BLAKE2B f402e24dc3b229c10007464807ecc8427aeb078745dfd82e333884455a333a81a4bef074cb4c723d52f280a0f82f7de8edaa706cf04cbda1e070a2e9444cbeeb SHA512 cd97c3611a7e5d9f87364c703f811fb2b790239f5c4db0998ab7468d218de6c16a33c5ce0ad8529cc50f00b8efa354c194e1bcfca1daa842a7110402024f328b
-EBUILD uptimed-0.4.1.ebuild 1421 BLAKE2B 363b45ddcb148a2e56c6629be1f0eca7c2a8e28964a5422ec1de992eea1823bf786508b80f82e587111811b11e6b4daebd43ca61d2d1444756e9e6a3ef9c6a27 SHA512 51401b8ed326a61d1bb2bb7acf22666ecc901a675c7756120bfce1091d058d280fbf66c891bb2da1082b54405a3b257de677e7f14942f0e96098e81b1daff266
+EBUILD uptimed-0.4.0-r1.ebuild 1665 BLAKE2B cfe1181127c603e3ae41b73147e6e86498a11ed7f0f1c688821bb9fc442abf1dcd2e7a2edb87aab66fdbbcb28aae33b3acf442cb9dd2bc5c3bee1f1bfdce3481 SHA512 ce1d9b90d71a2cb49084499e22994d75e4461480f1f939f26f1fb75b2453749d2afbc55b5d8a96e6cf7b3f5d7ae4249f175a3198580e0ecc53ba566eec9c1ad9
+EBUILD uptimed-0.4.1-r1.ebuild 1584 BLAKE2B f6c1c8fe723808c89552e239cb6f56c01c19ae6dd93c270a3509436f4b8be0558c62ce42ac4ad04a576ee24d2948181ad45e4c063866fc110b4e2f3d2484d4c1 SHA512 b760062bd5f221098a5ff4483fee45b8a276abbf5794f88f0108132776bd84b8d49678f645afe8b7bf62c33ec3d60c073cab67c8c624c297f80d93878edc0978
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
index 2fbdfafd16b3..8e4829fd4054 100644
--- a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils user systemd
+inherit autotools ltprune user systemd
 
 DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
 HOMEPAGE="https://github.com/rpodgorny/uptimed/"
@@ -36,15 +36,23 @@ src_install() {
 	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
 	default
 	prune_libtool_files --all
-	keepdir /var/spool/uptimed
-	fowners uptimed:uptimed /var/spool/uptimed
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
 	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
 pkg_postinst() {
-	einfo "Fixing permissions in /var/spool/${PN}"
-	chown -R uptimed:uptimed /var/spool/${PN}
+	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)"
diff --git a/app-misc/uptimed/uptimed-0.4.1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 498d1fc64756..4fecae3a38ba 100644
--- a/app-misc/uptimed/uptimed-0.4.1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="static-libs"
 
 pkg_setup() {
@@ -33,16 +33,24 @@ src_configure() {
 src_install() {
 	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
 	default
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	keepdir /var/spool/uptimed
-	fowners uptimed:uptimed /var/spool/uptimed
+	find "${ED}" -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() {
-	einfo "Fixing permissions in /var/spool/${PN}"
-	chown -R uptimed:uptimed /var/spool/${PN}
+	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)"
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 65ab524a6866..07c8400c18d4 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,5 +1,5 @@
 DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
 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
+EBUILD yq-2.3.4.ebuild 632 BLAKE2B a81bf03443f6db49a3f85b36b08caaa23e16dcfc6b523d5ba4024ee1e076d2227a0b13d0273b6153a04994ccf41dcdb425de1529bba784f6747aa42e482c6b1b SHA512 b915870a0d8dc5f631c1163cc72be7f8058e62007a1d98923269970fd641a876629e5a0d5824d058b0ce45c9873094f34a40333e9c5869ea30a97d0ffffa41bd
+EBUILD yq-2.7.1-r1.ebuild 1013 BLAKE2B f39627b1837f831abef226a3aab6af871152cc91127cbdb655b77007c9a961b396f94bf0a0a2069a1d279cdf82c64ea5e6192f406c589457c2481be80a6288de SHA512 7f50f7e0a789c4f9535446017c0e204ec1640ea3635d7b79194702b24e6f53082bc4822fd2194883384b0d02a0990d3da3c6331d3ff980dd3d4b91a4195fcff3
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
index 1508219d3b3b..9936af814da0 100644
--- a/app-misc/yq/yq-2.3.4.ebuild
+++ b/app-misc/yq/yq-2.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
index 7b34b51cdb04..e433a14e78e8 100644
--- a/app-misc/yq/yq-2.7.1-r1.ebuild
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /app-misc
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)