gentoo resync : 30.06.2018

41 files changed, 115 insertions, 691 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 9bd97eaac8fc..60fb70458c75 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 2bff9457efbe..b599b4960532 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,7 +1,5 @@
 DIST dunst-1.1.0.tar.bz2 79032 BLAKE2B d0c0550a7bc2da5ba5f3fdfd04d06c03e70cf3bc4b69dc69071667a885a361fbb9564dc02d6a0530b85eea2df845b8b5f917ceef0dbe5159f968f20ef50762f6 SHA512 ba01a6b18da5199b3356342f5c22592f93f447389267810bbfc35decf1a67f89650d445d3c1dd6f3cc76a4f86f7165adc777b669444627e42d3e671d4f04a04b
-DIST dunst-1.2.0.tar.gz 110628 BLAKE2B 4bd695c31da23aa5657e3f8aac7c3d54d66f720f57d1b256c215f5d0a42c1367fbca7838f6f8e85c87df7a65c4679413be30608b48e3f017f54e695fa064c10a SHA512 223c8aae61574770a76bff84723643a3c03d3d9a8f4094bc4e92e16826703e7c0a7c3327945db8469b8dcc48fe5cfaba51e6724149e6571a7ffc1716656e30f3
 DIST dunst-1.3.2.tar.gz 121575 BLAKE2B 97f0011ce960a7852dca5a2917e328de2cc1a052ad0b7c2f07e878e3b6eb5281e49a070a574885b9a66eb6dc30ac07fdfd6322b44cbb7dbc1edf8d193a68b538 SHA512 eb7bff16a19d8f60e2f0eec419a0ffb2f8822b5ec2ffbe535303a71cc7d4ef528e5dbf2fe5f8f2f6f5bfd1ad2d39eab79b68054af924e118c646e059b6929465
 EBUILD dunst-1.1.0.ebuild 1193 BLAKE2B 22be8ac22df55546417fd0afbd6231b9b32ca1f4f95e20729219681a00e397d7a3a13f7499f0d05d72037413fb00dd45a7f2f6ec35a505695087fc6970dd22ea SHA512 3dae12bba3ee11392cb59428164543d36280a256f359041bfa575b26622615c5211370888d7fd12640bcbedddcac60179b630d7485e8783532926ba423d791c4
-EBUILD dunst-1.2.0.ebuild 1074 BLAKE2B 5d447c350b682b60af29da65683aa8255a74d0020e3993a64e1e724a3d9aad690f5f265402c0507f20f327323d5a7425533e14913b762b778b77b52c69040ee2 SHA512 dfda0ac316107e33237af4c0db8bd4bc65d3f0d8831cc81229b7340a58d1f3ba458b84bdbe6108f9a3629121acda63bbec663c640cfcdae469e403aba20bef8c
 EBUILD dunst-1.3.2.ebuild 1077 BLAKE2B 9bec7b7921fb762a6d929cae4d3024561a49dbc83e8ed46347c5b02bce198d7b3e5b2081e1481f9cc7ae914ae039fc9687a365b3c8819170ec5788840ec4f59f SHA512 9d809d67cf6b59a4c6d2bab878bbc154f20a0f45a6a4344895af14d42e63b760801adc53087c24e29057fe9373ed98f8df13a9bc4cd85ca4ffc5d04aa3a03de3
 MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild
deleted file mode 100644
index 01a433b8b8ea..000000000000
--- a/x11-misc/dunst/dunst-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="customizable and lightweight notification-daemon"
-HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dunstify"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxdg-basedir
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2=
-	x11-libs/libXScrnSaver
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/pango[X]
-	dunstify? ( x11-libs/libnotify )
-"
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
-
-	default
-}
-
-src_compile() {
-	tc-export CC
-	emake
-	use dunstify && emake dunstify
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	use dunstify && dobin dunstify
-
-	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
-}
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index f1f4e823600a..dabaf307fc6a 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,7 +1,3 @@
 DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
-DIST i3lock-2.8.tar.bz2 19884 BLAKE2B 67d04d91cae22f14210cbdbcce1a2aecd3eae0d649c8182f044c1c6bec5c8e63ab4cca647fcd3c2ab61c600a83157ce0818b566b59a632b509390f9b4d069a80 SHA512 b0f2f2837e275ffb2874aec75cd5d7c69864f8861de5e3e6090a2bf9254a14f8bc141256b0faac3e30111f9612e97cc087efde0da939854fac975a87deb06e3f
-DIST i3lock-2.9.1.tar.bz2 20959 BLAKE2B 05f35e3cd8fa45dfcb7021d3df19eda85ec3ebc4be9fc5b0900d88569d078bc4a773e6de155f76c13a45c9c914e47171c5ba000e6ed3cbb3b50cd4e847b78aaf SHA512 9b1bfac67a97880e61f8655a9256662ceec51850005298f13247ab570c03715718db84b1afefa979fb9a53a011fa20958f38d05f5378becf7803ece3e804faaf
-EBUILD i3lock-2.10.ebuild 672 BLAKE2B dc61ec5b79951a8b3d3002be93b8d13aaacc3ea8684cf73cb92282d96a3cac03ccc72197760568d0e4b1c7b7c1d1d09ac6c9c54ab85947979b168b4279ada227 SHA512 c3470da5fc1adf898b78fec80836d2c1dc2607525101e00ddf23beb60e435cf6ca742fa8b121c982be89b7fe534feb583f313cd16544050d0c11e292106bc57f
-EBUILD i3lock-2.8.ebuild 678 BLAKE2B a5c8ebe54d6dbedc67ed3ef7a670b54da8ec83a9b9f6873ccf1804e15232f5fd96fd1ccc9f4112a47d72941f5ddbaf2f310b496b84b27c3d58f22cc706bff941 SHA512 6e563e5decd47299172fe2918da28810ec167ebe856795218fdeac850015f7562d2ccedaf29943bb5f74131ef1d459e2b344791f6b06af6daaa320a2ab40f65a
-EBUILD i3lock-2.9.1.ebuild 660 BLAKE2B 4968be77ba5f5ecda76bfe3674b40a3fb19ecf2d8a1abd9e3ee7050ff380f9017c1822054be71dd40ebc4a2420b1527a418ae22c0b02b051ca8ecfa640f52abb SHA512 6b4e95f87132276d0750dc75e8947b8a32ffdcc06c6a0d88805a6f066c72dd511d25b7ff79da422771a18e50839d9c40160d772ecb4e58f6fda45fb14bfb292e
-MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
+EBUILD i3lock-2.10.ebuild 670 BLAKE2B d0da8763dd30fc3f354176f3c1d8e0ec2bc0758c4a732c485cdcb9b6510445644117a3b3bff77a78e2eb5c45df09b948e75c8fe186888baabad0d3e06d3e9a2e SHA512 1e77903498fc04b1f8daea6ceebace300dffa77eb97156c33e0be880cc73dfdd89827bde6ee1db23d83f23f8b9466b3520cfd6f9ef57397d515fa1a785e5fd14
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/i3lock/i3lock-2.10.ebuild b/x11-misc/i3lock/i3lock-2.10.ebuild
index 7cc7504d5245..9579fdae9707 100644
--- a/x11-misc/i3lock/i3lock-2.10.ebuild
+++ b/x11-misc/i3lock/i3lock-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/i3lock/i3lock-2.8.ebuild b/x11-misc/i3lock/i3lock-2.8.ebuild
deleted file mode 100644
index 1b0619ea0152..000000000000
--- a/x11-misc/i3lock/i3lock-2.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/pam
-	dev-libs/libev
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-	x11-libs/cairo[xcb]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( CHANGELOG README.md )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	sed -i -e 's:login:system-auth:' ${PN}.pam || die
-	epatch_user
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/i3lock-2.9.1.ebuild b/x11-misc/i3lock/i3lock-2.9.1.ebuild
deleted file mode 100644
index ee3f80478d45..000000000000
--- a/x11-misc/i3lock/i3lock-2.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/libxkbcommon-0.5.0[X]
-	dev-libs/libev
-	virtual/pam
-	x11-libs/cairo[xcb]
-	x11-libs/libxcb[xkb]
-	x11-libs/xcb-util
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:login:system-auth:' ${PN}.pam || die
-
-	tc-export CC
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index e945e1307667..2ba8e9e851e4 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index d3afd99eed09..02a12e04d1b1 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,3 @@
 DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
-EBUILD imake-1.0.7.ebuild 707 BLAKE2B 007be78843bda68b2065d9fa0756b3f7747887e344d420c307c11463582d93d363c5540ebbf9490878fce202af7e96cfebdd2d96cf83f1da71d7a2ca0bc8d972 SHA512 155fac28847bfc82fe28f0af99b902fd423a55d8712a65f59e1e57b0b36064b83a9103b0e1f9be0dac21273bb38cfd4bfc9cd2b67e3e7dc1392c3dcd0027ee25
+EBUILD imake-1.0.7.ebuild 706 BLAKE2B 71e4d7544364dee5831c4c7b81f68d8ed696b19cee1f4b876fb047a27b4c329b0230c8cf10d6e2d70a503e378dc2c455d1a6177082d4c225d801d4e3aaaa1bc7 SHA512 7a66beb7081f938f47223aa7233295a7eae5d39bb6652307ffd3892ea8a2688684108fc7096ee18f3ba62d2e23f38ceff89ef99f1b07154cd59eea74aae764e0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
index 3c873f2e98cb..deb33c715a44 100644
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ b/x11-misc/imake/imake-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index ee42775021ec..735c5775fa25 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,5 @@
-DIST kapow-1.5.5-src.tar.bz2 722262 BLAKE2B 5f1c66b38edded3f2ad1d76d97dab036264169176647a25dc618a6e4149b40f4d4ed368edbac7786440ef49fe77e896db084edd9c210cd278b92ba175d49c63d SHA512 d22f8c1de74333b31b49ec752118ce36624895f99073b4b3f57a78f32e331ed33365b5664a316604e573820d38f268f0ceb6531bbf60eca05aa4a09fe5436a20
 DIST kapow-1.5.6-src.tar.bz2 855057 BLAKE2B c0d5afefa4caf0f1be243e8e2e5dad80e52bab4dc856791d198d009a90c864aaafbe2eb624e114f6331c685b2bbc1664add045de9ed46699f865481461968423 SHA512 b0d1e1ed3cbe9a4a4e253399de4ec645f832a10633275b122729dd7653bbb40c7cd473251459fe1e0c35be314a02c704cac3fd25cb7ee498e282a58df6cf06a0
-EBUILD kapow-1.5.5.ebuild 1279 BLAKE2B 989422cebbf4529834e808b86ff4bd411a354a21fe50de1243943dd7cf54a02eed31af4cc269918f8ac839857ec162901174848a6dc15e80fdd83e10741deea3 SHA512 8f254fc7fd102555bb3a3143c4f1a60d965d5455764638b5010004c9b7d5819ace6e485b8973c051f437963ecd84a9f759487367d0b18acbaa6ab4459ea40b43
+DIST kapow-1.5.7-src.tar.bz2 855284 BLAKE2B a153b8e6356850d66f3743d91b2be685c9c51d2f257fe37b89d95fc3fa640babcd53470de0a7097174b87c2ae2cbef530e09e58d53b024fb893959354d1ca4b1 SHA512 05244e3c76350af7e7e3c35d70eba30580221fcfe73d652944d8dda40d5d630b037440a4ca296773b404bb7555b3c4aaba988bc51593456150eb9b2f69d1d2bf
 EBUILD kapow-1.5.6.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
+EBUILD kapow-1.5.7.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.5.ebuild b/x11-misc/kapow/kapow-1.5.7.ebuild
index 00138613950e..2dd79d2b2ec0 100644
--- a/x11-misc/kapow/kapow-1.5.5.ebuild
+++ b/x11-misc/kapow/kapow-1.5.7.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	dev-qt/linguist-tools:5
 "
 K_LANGS="
-	ar bg cs da de el en es fr it lt nl no pl pt_BR ro ru sv tr uk
+	ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk
 "
 for K_LANG in ${K_LANGS}; do
 	IUSE+=" l10n_${K_LANG/_/-}"
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 30a56e0d978f..f910c369c2e7 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,4 +1,4 @@
 AUX menumaker-0.99.10-AM_PATH_PYTHON.patch 2517 BLAKE2B 45fc07e14f0b89106464b925e68fc3b9b8ea23c14e5091150ed45c7a3a7bf84e310d0cc2437b021f4a83c4d162200b44c5deb23c1a40740dba4379dd682ad964 SHA512 8ba6d7898f5346a6e64ac1cbf17f914c44835f603c9d5952e226063c2d7d3ad64597e41a8a0bbfa4dd12966ddbf53722bc4c28d3ee0e5c860073e08f56fa2805
 DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
-EBUILD menumaker-0.99.10.ebuild 1117 BLAKE2B 67ea5d110c3af67b5d3e813a98a27d784b90b72a9673b75de1cccf8d436958202c0141b0b49e12937ccfc0cd93dfcd3f014ee2b50538c65ba4a66e2aa1f91f1a SHA512 034927ead7d0f83819f1953c1fa3dc93efcc7bba541274d7da6b1bcfaef4b9e243b5945e93f6063cc4885d295e6cc048d58b104c502d8f8a96933db98ff6cf88
+EBUILD menumaker-0.99.10.ebuild 1119 BLAKE2B d1db58ede27c04633a9d696a8c708bf3924be4b62b1f27dbb5bd85ad70a3ab894e71fd26ff38981d2bc61e741c3b6e7394a0df407c66ff7a56b97449c61dde63 SHA512 f25d24f5d459c06f14ea99bd3967c499ca80887cbc8dec417502b7f15062efcf88e778f1d8597dbe1f02c3ab90be90882b107c0aa69546825e199258e6ba7c02
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
index 07a220f4d6f6..16187245d17c 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit autotools python-r1
 
diff --git a/x11-misc/mixer_app/Manifest b/x11-misc/mixer_app/Manifest
index e7b15828bb85..7ea0f0b30e7f 100644
--- a/x11-misc/mixer_app/Manifest
+++ b/x11-misc/mixer_app/Manifest
@@ -1,4 +1,5 @@
-AUX mixer_app-1.8.0-build.patch 1018 BLAKE2B 612ba11eea272c120dfb499a9324c427612463c057ef4593010aa9bdd9799dab05d9052c6a4add45b780b423f0123b62c4c76bbd4721d495425b08b6652e6c8a SHA512 3d0146efd88070b803b14434c93baaa635f54f10324155cdfcf08555cac11f655d40b257bde6e25f83f04d96a63da66895d8460d4bc6b9211c1cb9956b199602
+AUX mixer_app-1.8.0-build.patch 1022 BLAKE2B bab0aace19b3952fae352ead05748166dd792edf05114d815049db2e4bd1b2f5e8d3b336292f81737762d279690841e09b1757a69f84370ae486e46463b667c1 SHA512 46c6e10f1e8dabede4dab55dc5293e24061ac45ea4c1d4dc114913d4cb2b8d2ca2a4ffe7b555de4001416ed56a67e74925da2a9f33d89a2e8a0037a58a59cad5
 DIST Mixer.app-1.8.0.tar.gz 37884 BLAKE2B 53c44947e59fa2b4f975a70a33cae76c1f721f3408021ffdbaa37750f26b67e2dc71457b5b08e7b29ea60dbafe34ed3a6ba0c22d7414c8f3bd0c5186207f62f0 SHA512 2b965cefda7ae93d8588b717becf25430f3dc5d1d6c3e38d24eac711999ced9c671cfdc76a0601022cf1fc7298d179b5780ce7a3bcf33291ac4d8ea215cd53f1
+EBUILD mixer_app-1.8.0-r1.ebuild 692 BLAKE2B ac9c342be8b3db5ca9570f42e8d8d7aebbbb51717dc192a808eeaa59b7caec8ad6cbbfd857346d03834e97eb1cc2277394406aa7962cb6e7b9abbebaad873f8b SHA512 4f1cc12b461be5361190350d41332f10df68b52b5255c6a83ac06ee53f3ff8d89f61bd73765095603135b4de3795df265483e6307c644bddfece54df23abaaa1
 EBUILD mixer_app-1.8.0.ebuild 706 BLAKE2B 84630771fd74ad20e4ff028ba8c59c2fee8f8e33bb09ea2051ff1d424a17a3daf88e0f27f8bb0a35202648ec35875e5aeae71b21dad6adc298a49a0d27a9d70f SHA512 34521e19c17ceb74270e767ddd56d87653e061383ff87e181de7605f22bfed5269f8c50b2b82f21a767655dc9a7caef00d7f1725347024e16f893bd1e720a34c
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch b/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
index f36ea6e78ec6..232a4cc4e9a3 100644
--- a/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
+++ b/x11-misc/mixer_app/files/mixer_app-1.8.0-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,32 +2,24 @@
  # Mixer.app Makefile
  #
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..45d98e6279df
--- /dev/null
+++ b/x11-misc/mixer_app/mixer_app-1.8.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=Mixer.app-${PV}
+
+DESCRIPTION="mixer_app has volume controllers that can be configured to handle sound sources"
+HOMEPAGE="http://www.fukt.bsnet.se/~per/mixer/"
+SRC_URI="http://www.fukt.bsnet.se/~per/mixer/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog README )
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_compile() {
+	tc-export CXX
+	emake
+}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 535c974a14aa..ac89cf600254 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,6 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.1.0.ebuild 1690 BLAKE2B 87332f0eced500b9ccd979d7625dc7976018a801979f7337ebc0a38a69c00c4256be93948774b2a93b618b6e7b4240141a8ee3ee217d72090020a0f74ca7807b SHA512 f31fad149bb6a58a30ff9ae2d0d15cd6fdb8396060a56d5627fc8d6e9b47ae456e3678c5c24965e0f8432f75cb9011876930c540abfde12d94d349f2ea399091
-EBUILD polybar-9999.ebuild 1182 BLAKE2B e457c43df7e40835a0ad863a3583d9389ae7871b61a89a9dd4530757c539c8843eccb08865d4cf169a1d452dcb3665766a577ae01bb165c24872d335fe279bee SHA512 99b4e170edd51117bbb326379b66a325da1c179980d68404d2e6d0ca18e6f11c8c692f44d548a94b3e6b04560cc34086cf7e5d3099278e235f9f06e00e84d1a0
+EBUILD polybar-3.1.0.ebuild 1694 BLAKE2B 140bcf98cc7dd8b0928c313d93335117e3196fe7da14808ab2a9416cffcfa802b100ff66ebcbada4e5ae9a2754641c2622b002e459ab100ed4be89b838693892 SHA512 1f60c5389d5e217bc6409fdd0a91bd7b0563606134a5528d8121325e88bb9967374cd4cd42d40a493eac6d93c35bcf1e6095357a93239d7622a2c93d6e32f670
+EBUILD polybar-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild
index 5897c55c919c..d2c4ebbf0f5b 100644
--- a/x11-misc/polybar/polybar-3.1.0.ebuild
+++ b/x11-misc/polybar/polybar-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 IUSE="alsa curl i3wm ipc mpd network"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
-	x11-libs/cairo
+	x11-libs/cairo[xcb]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 7bc1f90e2291..3d18bd3871c8 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="
 	${PYTHON_DEPS}
 	x11-base/xcb-proto
-	x11-libs/cairo
+	x11-libs/cairo[xcb]
 	x11-libs/libxcb[xkb]
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index d8e92c99bd76..0c62356ef2d8 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,9 +1,5 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
-DIST rofi-1.3.1.tar.xz 211732 BLAKE2B 60a217a47c547b1e59632356f4ddcb37144364a990974cbc013c53b21eae04e9568cc39e2ba6d2ea681501582910fb685bcb865cf011be0b2f00d986f4317c3e SHA512 a96c53ad268883277c4ff0ee3267ff7fab4d4a93a982019ce19ea82771b65c32d56216d777494853bffd18481400af72ed777f88cce4b26d7d1b8980a997f6c6
-DIST rofi-1.5.0.tar.xz 354232 BLAKE2B 2478902542b994ba06c4d436fa9436659366e2416e1a7a3ddd9a48e84d397faff963a4ac0c1bb1011a5f8a8440d1fc257377d28f556a60dc264b29eadadf5c7e SHA512 f24f93224f38e009307912dec19182a04b36a9ac88b26a8657d853cc040e1a59837a56a3e8ff08aa34143f455b5030c73fc28ced96123f3bc7e3943582aee81c
 DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
-EBUILD rofi-1.3.1.ebuild 956 BLAKE2B 5d895c9370bf82c6e5470ffcfd15909a79a67e55a20ab33bb39407312832658e604a823e90e3922a9bf7a25dd3d73dc7f31cb1b8d8993f7797303fdfe52f3807 SHA512 d78be7b3ee5cf1b19e2761a746b0286185bc9f1b7c19526d2234cc33b0f6d1dcbec269be43eef672c77fd6a1a3b11d9b049fdf2ff38b2bddfe8c805c19d5b3bd
-EBUILD rofi-1.5.0.ebuild 1143 BLAKE2B 0c2bf36ffb4cfbcbfa4e815558ab64452f642e12fff1307559b3b7d13cc82f5c332db11de061709d066e8d06379a0a9d2fa11db28143c67d5ec808c211ac2d90 SHA512 c6b8ab4ea5ac3c6dd0db8f182e49e55a1660fb7b5b79ddf1bb2e04161d4415afb0a5f21b90de5a3627cd4ad5fa1797fca8dc9fcf36a5b800574a46646df6d319
-EBUILD rofi-1.5.1.ebuild 1150 BLAKE2B 332daac7b4cce8741bdc2b00080a04df283d13d9d5b986a0a5459b2febce3e3a521791376a920b895e7717f8ff61fc0ed5f0cf5398fa4e24f0b36e2445a1f7fb SHA512 121484af2d9c19d5601b2199343aa88c639fd3fc0522829d904b5bd5a2bb6ec247c570dfb404dfd674a5ea5ece17eeddbafd786c3249f460a194992a86f94960
+EBUILD rofi-1.5.1.ebuild 1148 BLAKE2B b7c70e7170a4388c02744a063cfce35bc71298e9ec8afc6943e70f556402c9356f75243640ad8a1744a4c6354e693bf7138f97bf532b72a5feca75f754254c78 SHA512 018e51cba23418e771ac351709c7cc9d636e5f2f97afd7567dd5f8829e27fb0e77b37af7901261cf5856e13a6266d7c6b1f898a2be9a100ec982bc55d11ce556
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.3.1.ebuild b/x11-misc/rofi/rofi-1.3.1.ebuild
deleted file mode 100644
index 6d2181a39178..000000000000
--- a/x11-misc/rofi/rofi-1.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://davedavenport.github.io/rofi/"
-SRC_URI="https://github.com/DaveDavenport/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="windowmode"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/freetype
-	x11-libs/cairo[xcb]
-	x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable windowmode)
-}
-
-src_test() {
-	emake test
-}
diff --git a/x11-misc/rofi/rofi-1.5.0.ebuild b/x11-misc/rofi/rofi-1.5.0.ebuild
deleted file mode 100644
index dc85085b3148..000000000000
--- a/x11-misc/rofi/rofi-1.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/DaveDavenport/rofi/"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test windowmode"
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	media-libs/freetype
-	x11-libs/cairo[xcb]
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
-	if use test; then
-		sed -i -e 's|"/tmp/rofi-test.pid"|"'"$T"'/rofi-test.pid"|g' test/helper-pidfile.c || die
-	fi
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	econf \
-		$(use_enable test check) \
-		$(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index d9dffef044ca..52addfae154a 100644
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test windowmode"
 
 RDEPEND="
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 0188bfb4a5b7..b20e55a7fb69 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,3 +1,5 @@
 DIST screengrab-1.97.tar.gz 161792 BLAKE2B c2f53cd3d7333d89737ae55753a03de2d3c39f7adcc85f278d54bfb6d734e6f71d9126f035184262bf437e4a5032350f4f7a07060a3eb4014dab15563f78db29 SHA512 4fea4fe68a212ef5436b4f2b2db64e6f830233e5af0cd28259ad84d292e5df6a38e22de1ba40efe083f18ffc973be78aafa0d9eed990229b5e2a8660d1b6ece1
+DIST screengrab-1.98.tar.gz 146776 BLAKE2B b795a881c4d12f8d0328b6eebb9632983ef9b2da3acccb3d2afd2b065b90a0c393605095512973075162580bd05e5365f2f356e4b8078d11bd4cff1dbbdd3469 SHA512 3d39874609b389263875247dce5f1b82ab215942be66eade4c5cda462259cab75607b92f3676798d8915f2d2bad3e16582fe38c61f049757706adb944d9229fb
 EBUILD screengrab-1.97.ebuild 718 BLAKE2B 9ea014854d796cc578a7ac45b172d01d3f0f2aba416ace4128f75b66e6c4a2c1fe3c00fa88242d3e4e27e0ab9a63e4f558a8e1399a38caabc8c0ddbebd2344aa SHA512 fe7adc46cd3f8b27ef1401b0f88018b484755a73332037191b2cf4c23752593eb76b52a4c25c08d6174e16718a931b3e30ddc7271091dc2a5496d372397eb137
+EBUILD screengrab-1.98.ebuild 720 BLAKE2B d04845edffa7d7380476f0026cccbe2dbad20f9271300f0c30513f412f52b8b899da9333fab7f6c6feb5fb0ea3e35ad236adcf16916ba45bae04a9be27a299e7 SHA512 afb366bed856d58deabe293a591b29e774c4a65ebf52fe69d6a77e7891bce528a3faae78fdedee6183a0020fdee6a18adbc3b0679185281a732f0c85c8f1449e
 MISC metadata.xml 444 BLAKE2B 2fb0a84a26a3063f8bbd3b1ad9857b358935de8e262b5ad60be88e62f36568c4fc2e0f5f42728de6e414ee21ec14ea61b14515fee9711e10ea5ab9bb2b998e1a SHA512 7fd9195b7a9cf80ebcf7b845bb8a85adbf2ea5c83988ea389c10a7c56300fd0678ff901eecf907afa755500b3cf18b6a165fa2587ad9dcbd234f36a4c4254956
diff --git a/x11-misc/screengrab/screengrab-1.98.ebuild b/x11-misc/screengrab/screengrab-1.98.ebuild
new file mode 100644
index 000000000000..af621c5c6208
--- /dev/null
+++ b/x11-misc/screengrab/screengrab-1.98.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Qt application for getting screenshots"
+HOMEPAGE="https://github.com/QtDesktop/screengrab/"
+SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libqtxdg
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtnetwork:5
+	kde-frameworks/kwindowsystem:5[X]
+	x11-libs/libxcb
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/sct/Manifest b/x11-misc/sct/Manifest
index 4aa78533808e..6eb2eec24640 100644
--- a/x11-misc/sct/Manifest
+++ b/x11-misc/sct/Manifest
@@ -1,5 +1,3 @@
-DIST sct-0.3.tar.gz 3679 BLAKE2B 75d9f6c1ab71f77432b86735c8a48ba356891ecc524a6e82399d470a4b502f094af4bc0a5912630601e9e04ebd9cbd6ccee62a3a0ab991c0c0ecc0c5117590fe SHA512 515719e61afb7274749e28321f79adae4f7400e535e577cbada8453fe22c290aa50e5db8a5b93c7945d1759e08619ae75f3f33e9649cf31805b1c2ec82f711a1
 DIST sct-0.4.tar.gz 4560 BLAKE2B a7434499d43180a20e4345ad207cd7644dd7271f9d1a3929e797263f5580e9f7517a3cb86a65892b68a1619a29cc5bb846fa40e3e8c14f4f5a5a7ab65dfa5ca1 SHA512 7a556c2d26cb2389a3e38e74de992d3fac96b29c637e20d1307e0ea0985c1119a3d05f2108d338612b407f5b5f5362bd3e5582722878d7ae62c568bdc9f46e65
-EBUILD sct-0.3.ebuild 513 BLAKE2B 15bdf92db1481dad24d2e700501078c5be4bcd7b90913d72bb9ea7a91205aec62d11c353f388b1e623a4fae3cb9b10a401beb8eb2b88359c128e07c1fadb29f7 SHA512 920cc573034ce08ac247f1d6fb18c2f9a09d4a2291c12467c9374edc3d11d8a272a924c308cbf781eb03f47a0dbec863e076441db84a7ed5df15fad2a47f820b
-EBUILD sct-0.4.ebuild 515 BLAKE2B bb7c90ab8223e1118d07466f120914843c42c0959c3d33459521b721dec0991bbe62049e3b20e6970e1dd567212dc4cdfc596963ab73052affaea2a1155491d7 SHA512 9641f7857910711f82bb0d4890a3aefbadcebec7fe2e8a4a6e410f9bc7cc8de82e087a6ba890dccb23c4aa917330f7ed6fb5cc04bfa8c624305b8022fd8150ee
+EBUILD sct-0.4.ebuild 518 BLAKE2B c967a87cca5d9b93bea41363b81bf10019bf4b1af177169135bc7978ac0da88643c0b45c8a33e031c248f03c5532dc2663bfe98bd5564155c3d5d27007c9fa71 SHA512 a68f1e74d4551bf130636988f70fdb9acba94c04a84b43a0902a3214a9665de80a5e0a09f2b3e7df042cc39ae16aeb461b769ec652311cdd6117efa4bcbdcdf1
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/x11-misc/sct/sct-0.3.ebuild b/x11-misc/sct/sct-0.3.ebuild
deleted file mode 100644
index b0c3decf10ee..000000000000
--- a/x11-misc/sct/sct-0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Set color temperature of the screen"
-HOMEPAGE="https://www.umaxx.net/"
-SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="x11-libs/libXrandr"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed \
-		-e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \
-		-i Makefile || die
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/x11-misc/sct/sct-0.4.ebuild b/x11-misc/sct/sct-0.4.ebuild
index f7784edbf7b8..e19debd35a48 100644
--- a/x11-misc/sct/sct-0.4.ebuild
+++ b/x11-misc/sct/sct-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,10 +9,13 @@ SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-DEPEND="x11-libs/libXrandr"
-RDEPEND="${DEPEND}"
+DEPEND="
+	x11-libs/libXrandr"
+
+RDEPEND="
+	${DEPEND}"
 
 src_prepare() {
 	default
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 117cd78be37e..0748eb89d15a 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,6 +9,5 @@ AUX sddm-0.17.0-switchtogreeter.patch 1873 BLAKE2B b54ec315ceff3f6f2541a1a643618
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.17.0-r3.ebuild 2311 BLAKE2B 39aca6a331d7b3946362cdc236681db3bc157a9383b5567927a5126ac2c4823e85a1b4cd590c33ffcb661f83915711e4dc395da9b8e817503248f3a89b320bcb SHA512 089e9d907cfec936b4f24f51c555b1b0811da2b83a79567b5a39b476e8dd2ef3a51c94f48a5e11fa34f6f56cd2de361a1ebdab7aacf23df990869571704c4dfc
 EBUILD sddm-0.17.0-r4.ebuild 2372 BLAKE2B b17f693274d6d62724fbc42fe06b84bb9b35ecf0104a55d3ed6b3d9731520a7a1c498ab4179d7fc57ae54350a310527531c86c5aa3d13325aadba6c3278d675f SHA512 1bdeea78d6c7af3353a5aef8f1785ff239bd11d1984fabbdbc6495900c1b8d80e12cc1f7b6d0a9dd8fd6630d7f43a91f3a0ed62af3a0e214e0ace34266c05b37
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
deleted file mode 100644
index 623e779a6f1a..000000000000
--- a/x11-misc/sddm/sddm-0.17.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.6:5
-	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig
-	test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
-	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-	"${FILESDIR}/${P}-logind-race.patch" # bug 656286
-	# TODO: not yet upstream
-	"${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	disable_locale() {
-		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-	}
-	l10n_find_plocales_changes "data/translations" "" ".ts"
-	l10n_for_each_disabled_locale_do disable_locale
-
-	use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 0ad2f2a179ba..c4beb7440475 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,5 +1,5 @@
 DIST util-macros-1.19.1.tar.bz2 83274 BLAKE2B 014cf10cb1389809c4de793d28aa7941403734bc0abb28d920b22be3f05b7597a7106d716b0f3b5de5dc945fa23095dfd032e103711dbcd0711b8634a5153b7e SHA512 d69a415d5922f072bab1ddf8984c98bc349a24ffc7a60184320a12992a76b04d7cb773b426b1a7000e6dc7983d59df51bbc8f2ff25273d63e4e238b4cd91eb38
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 EBUILD util-macros-1.19.1.ebuild 483 BLAKE2B cf7ad79fa74ce7a9f3d50a4f4981970d85e11029bc2d05a1f2d1ae3964088255bbbb14aa99339e6055d093a698191c73876d2c2379064df2936b7e2e1b6689a3 SHA512 6107a49a06da5d5f508528eb4d0cb92559e33f0944f690bbf412b0858f3e2d6629c2a2286ae521b55f769ab69d0338873be05182a55d7a44fcf9d357ead14c64
-EBUILD util-macros-1.19.2.ebuild 483 BLAKE2B f34920bd902ab608681c8510efd5dfc20c37270654d4a4417fa1cb728ee21793098526b2ba55f99d4a5fb67bb9ea4cdaf6620587eae05333086b2971a2ebbda3 SHA512 72147a6fd78028456455adbf8ffbc135d70b87e3608859024244970809ddbaa8c66bcf046b560dfd760af027d8fc0fabb7d816bc1bd548b4c533130c87f4c3ed
+EBUILD util-macros-1.19.2.ebuild 482 BLAKE2B e4d3f9ca69f9f0a76a8e08c0afcb4a673cbbfdd38c7ad2ebe73104cae39f4c84d63c72c4de0e3e68ad5d146b313322b20967416f7922718f973ada9d90115284 SHA512 79d70e4ee32a706daf0884a5839fcec36b63ea49abe7b9da80e56b445af32d8c288170ceee9179cd70a57bafe20afb8cf9f3b5376aea57a980a345b504d904fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.2.ebuild b/x11-misc/util-macros/util-macros-1.19.2.ebuild
index 65cada7e3812..d97a6a0bf6d5 100644
--- a/x11-misc/util-macros/util-macros-1.19.2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2.ebuild
@@ -7,5 +7,5 @@ inherit xorg-2
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/macros.git"
 DESCRIPTION="X.Org autotools utility macros"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
index f583ae5e5370..39834e35353d 100644
--- a/x11-misc/xbatt/Manifest
+++ b/x11-misc/xbatt/Manifest
@@ -2,5 +2,5 @@ AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b9163
 DIST xbatt-1.2.1.tar.gz 12779 BLAKE2B d93d13125d482ebd5b2979033f09ba74526ae8f11d5f4bc88a3ccb0129e3e0ca61e8ca4389c45d789e440389de59939319dd1ef3e03e8e9ca78a61d25b3fc83d SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020
 DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d
 EBUILD xbatt-1.2.1-r1.ebuild 813 BLAKE2B 9cfed25400cfb29c5e6872ca44ea82ca8471147e254ca7416fbbb234820080960127fe6a3b23c5c136e2e50481da0be50366d855e7081f719af7de8931fda28c SHA512 3809f6987afd72c29d175fea3230b0cfe22ddc88ae8e4fb825692aaeef77671b1306b493f043b08346bceb6587fb2c50541b802c95d787864ee56624370bda39
-EBUILD xbatt-1.3_rc1.ebuild 886 BLAKE2B 49b5c1d602e2974f0e123bc74a7d77d3cbd0a353b914cf601aac15f954d99d2e685216c48cadd8dc9287650047cca12ab7581e82cbaa7066e172f46212184646 SHA512 cab2e0ac45c409672c2c30c9bf29d811f245944304317cfe7418a3d8cf43c2d656f4bc75c1c8da3d66a2187a1c749631bd4754cb15bdfe08773a6e97a37f7022
+EBUILD xbatt-1.3_rc1.ebuild 863 BLAKE2B a94c121cb60bfefd5e508da10e829232ce9c0b1aadc45b5a6e96cb532c108f87d87687ac27037ef770509c377c979ce8e5a0123de0f552305917602b2b49dce5 SHA512 157983233e0a7ad3b6de3760a2335bbabfd0cdb772acfdc18fcc38a42466a40481a77bc02d3c58398f2a582622d1c9295ae6daca7dde6b10875e1d9b2a91b29b
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index c7c8c3949274..e8323ad9d9b8 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator
+inherit toolchain-funcs eapi7-ver
 
 MY_PV=${PV/_rc/pr}
 DESCRIPTION="Notebook battery indicator for X"
@@ -11,7 +11,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="xbatt"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXmu
@@ -29,7 +29,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
 )
-S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2)
+S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
 
 src_compile() {
 	xmkmf || die
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 0b7946090412..552392e9ad32 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,5 +1,5 @@
 DIST xbitmaps-1.1.1.tar.bz2 113346 BLAKE2B 2ecedf3208ca8d5e4802bccae0316e0dcb5ad9b1efede1ace2348779797f29adf6aa6b173fae4874cf7ab73341f87af0bdac645a9e378c8946fbd941739fefd3 SHA512 172a74014e699e5f295ae726a77f1669baf4ac00d64a138b77e5502102b2a02c10127f35ccea5b6af5479d17f60a6bb63ac0f943fd071ab8b396d43ef314ae61
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
 EBUILD xbitmaps-1.1.1-r1.ebuild 469 BLAKE2B 14ff0927ada1adf936c496bc6c8168f8dd9476db1407da50742e814ffbdb0ce57e11c16e40a9d64c5b07e9014c472aa06a80dca58c470df6f6a1babba5aba497 SHA512 00b7997e9722f3fffca67a76590239658e8c3cb1d42f173e055608b0eaae0f81fd0978bfb95b2017df2a15d05efd2f08c2807a32269cc33c1443b3c6190f75c4
-EBUILD xbitmaps-1.1.2.ebuild 469 BLAKE2B 6c6bedf8adbe6a92f899e6dbe93790e60e875035ad2dbe593afc3f23eb4d3b94f92e0e5bb471333246990fc047c049d0f82e681b98e0a735f3d9bffe2ad90b37 SHA512 0f2cec393f2b2118ad35f43fe45502c8b734a34766974006e25922f9c8e91a5670c859ff471d7ae3052cf57e366140fca69ac7531812988e64dcbe567c8e632f
+EBUILD xbitmaps-1.1.2.ebuild 468 BLAKE2B 082f551bc0bb00732046acecbfee1c58d01a6051889fa185a49080bc967fc04db58fc55f642dcddb6ec26f4a5d1d60086a673709794b4c8709d86d74a0c5a218 SHA512 e42d3550476b545670a5b65f10d12a85779e5d2674cfa9dadb78f0520aababb8c2343e5b38e07b1d9742319ff7735045a2737452ef1e6955155ddc735e2db8c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
index a40eee742150..070ad2a0725f 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2.ebuild
@@ -8,7 +8,7 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 44a084a56556..1cf387b57d52 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,12 +6,8 @@ AUX xscreensaver-5.28-comment-style.patch 698 BLAKE2B da9a224ae0b657c8868fef24ad
 AUX xscreensaver-5.31-pragma.patch 442 BLAKE2B 375199197c7e3eaf5028099f0fc8b754b7e5dca4911a76de46372751c82a060ae9c0ee5ed35d1efb33f02d6ffbfbd5903ba5f823e1db5ba9d2762a8841cefacf SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557
 AUX xscreensaver-5.35-gentoo.patch 1328 BLAKE2B 406f9c9d318ad3de6d5b098f54b2586971240f513b6d5dba12bb2862693a548dc550d9c812fa570a68aaa652d6287bb48818512ededfc621edbb4be384312d60 SHA512 ac7b953a353f75821cb15a81b6dec224fe16601df9a9a00f90831d55ac8a69074ec86fa16967ac40e0583bdabc3b7aa2576acf3879942f274296a36997918b2f
 AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf2656ac63bb77ec1c21885e0dc8f213580669d8021ff2de76556e7be00bfee78f9c6adf410b50e57d404637fff83c42437bc SHA512 fbc7a4f8e296e1249c2e0454978e48ea82a7b99f2467e2f46ff65e3294f5d8b4a5e366c3b6c9bc37b7f0aca92fa6d59d7492b6310d48c0b3240953f77821408a
-DIST xscreensaver-5.36.tar.gz 10600872 BLAKE2B 5039722fa3aae2fdb42fb99516685f0c1fd91112f1104457988d0e7dbeb995266d60e76178a099523c920c07e1b8bc2c73c223a7a2db7b728c599cb1959a6751 SHA512 4f476135bbfdce0593bb6e5a6a48dd474fcce6031214ffbb3d43dc91bb8e1a28b3e59fc960d5f1a9ac0bdd3dc4531da26679bffbe47b7fb00b67ad74295b40f7
-DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61e57f343f0ca59f38c7b8d2c7fa03a5b08a5ee424062bba8a4c95da2ec32d89cbcf3cc84cd112fbd67314d3db56bd0ef SHA512 9bef3caf4eb495bebb4c1818ed0bb222be28a7a8d525e2bce70e92d7617bc8cf89750dfaa8cf7a3cd0c489b4831c95f9ff8a0164579cf047aa63681254c8e443
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.39.tar.gz 12157285 BLAKE2B b33bf64541d07b2f65788160af0bac308d4bea78a6d2e13332ac0e80a1811cc8270e0922467c76a77bd3481b367e4421b6919d017e7a81b656c4bcc85c404741 SHA512 3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
-EBUILD xscreensaver-5.36.ebuild 3380 BLAKE2B f732eda2a852e786bdf1d721157adc22609ca84291918559c55b29ea9760836f68fd7efeb4ce3910e83a27533c5c1669604cd57557d3a3c28cbc45855fecd4c7 SHA512 6778de53fad71267d6186948996bcdc48b893527fbdff71d1bfb20cb263f6ebdcfcefbf5b0b753dff4e8c308ba47f81e0f37814c97bdb3a7c903c8ce7c59afa2
-EBUILD xscreensaver-5.37.ebuild 3389 BLAKE2B 4c80280782af33d10fe2232398caad29dd471f8c388b925e1586f79f46dda82f36f8801f66416a403094510559fc2b60f1ad6362ff60dd1ee81aeb5a85e35e2e SHA512 30d313f2407d02bf682e0ff7b71773d158293b402da052f3e1439db9ad93b29af9705e190655d2858ec283b7306af4246001625b5e062282d4c30ead7bb5c01b
-EBUILD xscreensaver-5.38.ebuild 3398 BLAKE2B e8c00fb88ab4d95db7fe291f536856735af6e1e0207693f3dd4abc7aee5726ad8142c3ff1650086e9e46c16414235b328f5a2e771d6620a77136976141ee42e1 SHA512 5ad9b59077b2722d421bfaa912a6bf2c38ec20bff3bcbcec8a21aab97159904fc68b2c7e10f2d766538e7283a97b82eee37350245ed59f14163005783d8c20ef
+EBUILD xscreensaver-5.38.ebuild 3397 BLAKE2B 9848d30fdb05f6ddc95d11272832f4b79e7b775e4aa08119a7892e373db9e5698fd3034749a64faa3a99b1bc964481270926df750ce151a824508bc58d410853 SHA512 950d1b8b3646c14bee671f75aaf5ed25cb6b2443922f131eb1c6d024efb4e5a2c856b4fd9d59a1d5727f738a6ccf340b99e304f2af4a5986a859100d5e835077
 EBUILD xscreensaver-5.39.ebuild 3406 BLAKE2B c584e9332e24aa43d35b80aa9b55114e13f0f3ceb29504034f27e0143594949c419d08188c16d814553c71acb915ac622cb37e0484db8a03b605ea8c0048d45b SHA512 0a721d26c16ff1c6d1f78975894b2ac89930dbf215f9265f834136a0400717dd08906cf4a7b41a33865445d61dae1780c5d35e0818c3373610fa0eabf2b07f64
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
deleted file mode 100644
index 1e5f9a6da935..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	eapply \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch \
-		"${FILESDIR}"/${PN}-5.35-gentoo.patch
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild b/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
deleted file mode 100644
index 27ea9efb104a..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.37.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="
-	${HOMEPAGE}${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg:0 )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
-		)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pam? ( virtual/pam )
-	xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-	)
-	selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/bc
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
-	strip-linguas -i po/
-	export ALL_LINGUAS="${LINGUAS}"
-
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	eapply \
-		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
-		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
-		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
-		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
-		"${FILESDIR}"/${PN}-5.31-pragma.patch \
-		"${FILESDIR}"/${PN}-5.35-gentoo.patch
-
-	use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch
-
-	eapply_user
-
-	eautoconf
-	eautoheader
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		$(use_with jpeg) \
-		$(use_with new-login login-manager) \
-		$(use_with opengl gl) \
-		$(use_with pam) \
-		$(use_with suid setuid-hacks) \
-		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-dpms-ext \
-		--with-gtk \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
-		--with-proc-interrupts \
-		--with-randr-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-xdbe-ext \
-		--with-xf86gamma-ext \
-		--with-xf86vmode-ext \
-		--with-xinput-ext \
-		--with-xshm-ext \
-		--without-gle \
-		--without-kerberos \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 7217682cba63..6c9b0653377f 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="