16 files changed, 107 insertions, 142 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c1df04c2aead..9730755819f9 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index d859a30d91a4..c70d0923038c 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,7 +1,5 @@
 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
deleted file mode 100644
index e8047db74a68..000000000000
--- a/app-misc/beep/beep-1.4.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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/datovka/Manifest b/app-misc/datovka/Manifest
index 342b6f9b9210..1716d90f661f 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,7 +1,5 @@
-DIST datovka-4.10.3.tar.xz 2554488 BLAKE2B a06c122403f7571c19abddca93e4d7270b66dbac9b86eb073634cc2c22dd26ad230ad36580b8f977e7033656d8f7066be89532c786ea554b293a2fab46309b9f SHA512 8a07c338b214bd0fdac216d6b278ebceee48aeb4df2d97a77a42f627479641d1824c5ed16f336f5da3205c46e753203aadfd0f83934b7caff4dc9c819e0cee0a
-DIST datovka-4.11.0.tar.xz 2575132 BLAKE2B c5fb753fe0a68c03571c490443428d36a76859b9be123e79a6fd32eb220f6f9f963c65e13b90e72554370c5d20bfef9fff6d47ebaa78e9865aff51d377280140 SHA512 ad245b0c2028a03690eeca6363e94852847ab20a4234aa89a4926d5727e9537e97a2dd53a6f8bfd7691e23480ab2c50ce681ffb7017a80996075bb000d6e1c5f
 DIST datovka-4.11.1.tar.xz 2583660 BLAKE2B 2d62e79c5be9d20e79d19bba43ce3d7fa8dd0b80e8bee6e63d04e63f6c878b84185b869fed1fc601f97350b499aa60041585693081e78bad5e0bc7e272aabcea SHA512 b36211b8830beb1f3a01b399303a1f2f87c77418975b007dac4b55613bdf54205eda0e7bac44d6c68e1102842eaa4231baaa46c31b99d5b6b145597f6a1366f9
-EBUILD datovka-4.10.3.ebuild 1081 BLAKE2B a27635fbbcc3b4ee195a8fa0ff68589eb5fdd00f234f79567c1029138d2891ef0213dbcd898325051b3e7c87af5cd4bba98a845bb19029f9751bce02c8aa0269 SHA512 6996ec1347f64fc045412c5fb2a8aafdc543dd7d91457c9bd86ab9a50e2442aa2364fd4f1dcac5f7644ec4e0adf009d9c9359271269e9a0be0e9c13d7b049a69
-EBUILD datovka-4.11.0.ebuild 1083 BLAKE2B a4a869bb9f5c52cce582263b9804c565a8eb4698ca04f361aaf018741319dc861d29d6847b808e5a2820ca65114dd6463860990e464c61dbb90eae26e7d2157d SHA512 521ed39e272932112bccd9f18c5eed751e6d0dae210d97ce9bf6027ec72b65c3796886b3a229d6166de8c46c5f18bc101a169c6847f3ef3c64224aeafe1b38ec
-EBUILD datovka-4.11.1.ebuild 1083 BLAKE2B a4a869bb9f5c52cce582263b9804c565a8eb4698ca04f361aaf018741319dc861d29d6847b808e5a2820ca65114dd6463860990e464c61dbb90eae26e7d2157d SHA512 521ed39e272932112bccd9f18c5eed751e6d0dae210d97ce9bf6027ec72b65c3796886b3a229d6166de8c46c5f18bc101a169c6847f3ef3c64224aeafe1b38ec
+DIST datovka-4.13.1.tar.xz 2749936 BLAKE2B 7f713837e40ea9de170d5a009179ef89eafc4191d7fbdedf547c6d3ba3fbd273c279e381876f48f457e5b9abf01fa4830adb0eaa2077768ce43f5718e00f125b SHA512 94623c0befe9096396083162a1fb26ac53510a47e5305c4bdea65bc65e3af096847508ba2028d0089f39a0812700506818759e2e22c354fecf96a117745aefce
+EBUILD datovka-4.11.1.ebuild 1081 BLAKE2B 69ca380374ee6c0ef333c6c5e7e32561ec146b63a638437601ff7645fd84f931c4a96f94ce88d45111719ab9dc6e07e351227fc483f8e3a3e78333ff3edc29b0 SHA512 b92315ef9f550f7aa923159b81ec2dd1265ff0769d2fdde689c990e23920d317dea9a35dbddde2892e22a8536ddc2cd848375c82bb187c559ef76a210408abec
+EBUILD datovka-4.13.1.ebuild 1091 BLAKE2B 17b68a7bd61d9f0dcc8d3e36adeb819013dd3722a273ac552611d315cc7a7ff912a6667a5446d892f1c3e34c29bf874f2a457e63179936710435f485b7758292 SHA512 fb2a614590eea9396ece25a80e0330ebc4a30a96e458bae8c487080d8d41d0e549cfb4cd49d776fd20b59e3f351c0e6b62eba234c9163337302535f3d8c5ef42
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.10.3.ebuild b/app-misc/datovka/datovka-4.10.3.ebuild
deleted file mode 100644
index ed60f494f017..000000000000
--- a/app-misc/datovka/datovka-4.10.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.3.2:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.10.8
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/datovka/datovka-4.11.1.ebuild b/app-misc/datovka/datovka-4.11.1.ebuild
index 59e45a1d68f7..101d7ef8a9dc 100644
--- a/app-misc/datovka/datovka-4.11.1.ebuild
+++ b/app-misc/datovka/datovka-4.11.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit gnome2-utils qmake-utils
 
-DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+DESCRIPTION="GUI to access the Czech data box e-government system"
 HOMEPAGE="https://www.datovka.cz/"
 SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
 
diff --git a/app-misc/datovka/datovka-4.11.0.ebuild b/app-misc/datovka/datovka-4.13.1.ebuild
index 59e45a1d68f7..7dcdeec590c3 100644
--- a/app-misc/datovka/datovka-4.11.0.ebuild
+++ b/app-misc/datovka/datovka-4.13.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
-DESCRIPTION="GUI to access the Czech eGov system of Datove schranky"
+DESCRIPTION="GUI to access the Czech data box e-government system"
 HOMEPAGE="https://www.datovka.cz/"
 SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
 
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
 "
 
 DOCS=( ChangeLog README )
@@ -46,9 +47,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index 87e45180a8c2..d55d57466994 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7.ebuild 1281 BLAKE2B 2276e3e4126dfd2014720a4e1507927914b7a6f4e484bbdce504ee6e3807958027c5aef9dc491870b45f8c83e12c8812cb3c9d0542d824022104b1ca1ef6bff1 SHA512 1c8844d88850a7a47e080b64fd58de787396500dd5549d67c383dc1a29d15f553e06bf37eab56ba9323459e01e10cbedd2f5c2137185833a3617a337d538d8b7
+EBUILD gentoo-0.20.7.ebuild 1288 BLAKE2B 19c34b30733dc7586e5b158f1f8c4641fb3850b6cca2877c746f2294aa2d65f62a8d8ce8f719ef143624de93e3c3dae5d587da886609e208eeec383c7406af82 SHA512 6a25e0435e3277847f1159dc55098f88ad484e55d2419d18d06657b08f66c2662fad829f70441f35d9d091ad574f94938500b3b480825948ad6f75317149e98c
 MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
index f84fcd4a62e7..b7996052edb5 100644
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@@ -1,11 +1,11 @@
-# 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
 
 DESCRIPTION="Graphical file manager for Unix-like systems, using GTK+"
-HOMEPAGE="http://gentoo.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/gentoo/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 8417386d9036..bd8e7978fea6 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,8 +1,6 @@
 DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
-DIST neofetch-5.1.0.tar.gz 115531 BLAKE2B 386544311fb3a46571791a7c61ee4657e155912add68172dd2c9fa59d6deb0f246b2a0880e00c31c422781ae765fe555c3f82aa2e7f93606419b2cd49f69a902 SHA512 a30ec9c0b5971f89e487a3d7f5a09b3a379cf2c1770abed82efcf2943dcea2640786d4adb276b3125e161bdf3aedee1549dd82ff05addb061479e5dc9afe99d7
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
 EBUILD neofetch-5.0.0.ebuild 698 BLAKE2B 71422cd78067ef24294890b0df2b5e658403d32dc2cbc1e451c9c235bdc179c11acf362d80168ece7b0aac2926e7c7fe91a0e21f173c462689035b260472e274 SHA512 5b584d0085c16606b7322121cee1b6f3805993bc7ea667659f2eb91ea1ec72e6ad00d5feb64460ff08dd1bdd2cf40d4c3f1a1eb30b9dbf0919e39024ab4381c7
-EBUILD neofetch-5.1.0.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
-EBUILD neofetch-6.0.0.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
+EBUILD neofetch-6.0.0.ebuild 650 BLAKE2B 7e971826bfbf4a4be3158d758f433f03c86002d551c4e299e860ddb65d2fe622b5cc54625c37383eaf2518deb826738eba86adfe29fc6bdaa4684a0aafb013bb SHA512 414a7188fc376faca0adfd0a4c5cadc4829b81eaa56ef89f52c860eae0eb1275cbcace080cf06e8fd9f1153ae71cef91593567be15580b27ea5e59841d2359f7
 EBUILD neofetch-9999.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-5.1.0.ebuild b/app-misc/neofetch/neofetch-5.1.0.ebuild
deleted file mode 100644
index 45192c9d63c8..000000000000
--- a/app-misc/neofetch/neofetch-5.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
diff --git a/app-misc/neofetch/neofetch-6.0.0.ebuild b/app-misc/neofetch/neofetch-6.0.0.ebuild
index 45192c9d63c8..b1d4eb92438a 100644
--- a/app-misc/neofetch/neofetch-6.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~mips ~x86 ~amd64-fbsd"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 1f6a71185b5b..d619d5e27700 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -2,10 +2,12 @@ AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4
 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.tar.gz 510966 BLAKE2B 63d4fe671afc00792eae4358c0833854cb5202a4f9aab6deaec9f3f459b0786d2d966294478ab2015a8d8d88d1815385422e1bd311d9211f88e130762fe4b770 SHA512 a712da19ebea240bafb3e8b0bf313baec6f2e6c6e32babac1221a0fbaaf4da82cd8cad4e6cf3da1e277ddc830b5405d104ca69b278627d3db5d0e4439d4896b3
+DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
 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 2138 BLAKE2B 89c87ee11e1a73fd76f271eabc6fcda3809ee460b882b1bd86964ea6d4fd2753675c04ce0d81703338ff16da679add1df1e8abb3a7473e62d8897fbd245b79dd SHA512 d4dbe7723d81806f78d1d6e02edb851ce978189ad48242f7f765d19a13635bb0428d477ceb827af845b1d1fc18bbd7b446ece50d3853534f32d6526207dfe7cd
 EBUILD tmux-2.8-r2.ebuild 1999 BLAKE2B 2ee9211029103f19ad942252c136e5cc50cdeb7b2d0a8b2a6ad5cecc1978be286a2264fa6ebbf979a900030c4cfac17c8afb9328518ff27343892469da9bb0ba SHA512 74ef935157bc5f61ef305c2ae0913f5e9215b9326cc7433e42c1f01ceb594d95e3d730e3cf6291e7207d63ece7cb48a05184d1af8e66487502eb2a316f6ab367
 EBUILD tmux-2.9.ebuild 2343 BLAKE2B 477341a4ae0c857652fb5d889e37a8967f59d50cc02b6a3c282c54c38e710131c0e033b1dc513d8ce9824f1ab16af0c17032ae83b4e8d6325a31c0264f7a3645 SHA512 1c2e8550dfba24673980d00a6c4d54f0f6a4a73b3ae54faaaa4e8b215caf2d8860deaab5d0965b629c62ba2731322fb705356a55c2e55f9bd3a8103f12e2639b
+EBUILD tmux-2.9a.ebuild 2334 BLAKE2B 513cb9cfacf185cd0d95aeaef70c781200e4031d4a6d0b64e3e22606804d079b85ac12fa2fe093b8f4da671c11d279fecb1760fe5c45a8d158c707c61f8f916b SHA512 149720b87a688dc11f5f48249b22fbd2498b893feb89bb03771567674716e38bdc5abf4c8ef7e472e8a5ad448b0968780c96c1d87ceebd14319abbb6e368671f
 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.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
new file mode 100644
index 000000000000..dedce499ebd1
--- /dev/null
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	[[ "${PV}" == *_rc* ]] || \
+	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"
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
+
+DEPEND="
+	dev-libs/libevent:0=
+	sys-libs/ncurses:0=
+	utempter? (
+		kernel_linux? ( sys-libs/libutempter )
+		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
+	)"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )"
+
+DOCS=( CHANGES README TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-flags.patch"
+
+	# upstream fixes (can be removed with next version bump)
+)
+
+src_prepare() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable utempter)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
+
+pkg_postinst() {
+	if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
+		ewarn "older, running tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to access them."
+		echo
+	fi
+}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 1a8e4492c2e9..d7191967ed22 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -3,5 +3,5 @@ AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bc
 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 1665 BLAKE2B cfe1181127c603e3ae41b73147e6e86498a11ed7f0f1c688821bb9fc442abf1dcd2e7a2edb87aab66fdbbcb28aae33b3acf442cb9dd2bc5c3bee1f1bfdce3481 SHA512 ce1d9b90d71a2cb49084499e22994d75e4461480f1f939f26f1fb75b2453749d2afbc55b5d8a96e6cf7b3f5d7ae4249f175a3198580e0ecc53ba566eec9c1ad9
-EBUILD uptimed-0.4.1-r1.ebuild 1584 BLAKE2B f6c1c8fe723808c89552e239cb6f56c01c19ae6dd93c270a3509436f4b8be0558c62ce42ac4ad04a576ee24d2948181ad45e4c063866fc110b4e2f3d2484d4c1 SHA512 b760062bd5f221098a5ff4483fee45b8a276abbf5794f88f0108132776bd84b8d49678f645afe8b7bf62c33ec3d60c073cab67c8c624c297f80d93878edc0978
+EBUILD uptimed-0.4.1-r1.ebuild 1583 BLAKE2B 60762388d28a8b1b1503c6308c9bfe3d7fd988ac94e3e699c597859770e5e1e406d69732d73a9ef526fcdc5e8ca73e302066b16b6b718bdeadece581d127ba72 SHA512 6824c09401d48b62fcee0cbaa5d3533f4b008934ca31c69227721fef858163abf847df503ba10a0ada2d049f51173b413cba130f89d11f729b5b62503ce5f66f
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 4fecae3a38ba..181b263161fc 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -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() {